git-merge-file(1) ================= NAME ---- git-merge-file - Run a three-way file merge SYNOPSIS -------- [verse] 'git-merge-file' [-L [-L [-L ]]] [-p|--stdout] [-q|--quiet] DESCRIPTION ----------- git-file-merge incorporates all changes that lead from the `` to `` into ``. The result ordinarily goes into ``. git-merge-file is useful for combining separate changes to an original. Suppose `` is the original, and both `` and `` are modifications of ``. Then git-merge-file combines both changes. A conflict occurs if both `` and `` have changes in a common segment of lines. If a conflict is found, git-merge-file normally outputs a warning and brackets the conflict with <<<<<<< and >>>>>>> lines. A typical conflict will look like this: <<<<<<< A lines in file A ======= lines in file B >>>>>>> B If there are conflicts, the user should edit the result and delete one of the alternatives. The exit value of this program is negative on error, and the number of conflicts otherwise. If the merge was clean, the exit value is 0. git-merge-file is designed to be a minimal clone of RCS merge, that is, it implements all of RCS merge's functionality which is needed by gitlink:git[1]. OPTIONS ------- -L