git merge-file

Run a three-way file merge.