git-merge-one-file: fix longstanding stupid thinko