git-merge-file --ours, --theirs
[git] / t / t5100 / patch0013