merge-one-file: fix broken merges with alternate work trees