git-merge-file

Three-way merge files

$ git merge-file [current] [base] [other]

$ git merge-file --diff3 [current] [base] [other]

$ git merge-file -p [current] [base] [other]

$ git merge-file -q [current] [base] [other]

git merge-file [options] current base other

git merge-file performs a three-way merge on files. Given the current version, common ancestor, and other version, it produces a merged result with conflict markers where needed.
The command is low-level, operating on files outside git's control. It's useful for custom merge workflows or merging files independently of git's automatic merging.
git merge-file provides standalone file merging capability.

CURRENT

Current version file.

Common ancestor file.

Other version to merge.

Output to stdout.

Include base in conflicts.

Suppress warnings.

Resolve conflicts with ours.

Resolve conflicts with theirs.

Display help information.

Plumbing command. Modifies first file in place. Exit code indicates conflicts.

git merge-file is a core Git plumbing command implementing the three-way merge algorithm used internally by git merge.

git-merge(1), diff3(1)