Fix a bug in gitmergeonefile.py introduced recently