chiark / gitweb /
Fix a bug in gitmergeonefile.py introduced recently