X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-file.txt;h=31882abb870b9720b2e7343638ef1c92eed8b2d9;hb=9ff74e95da5605778bdc7567ae63d70c96e6bed4;hp=29d3faa556f8e7148edd9f01d1ffa870e78502b8;hpb=54851157acf707eb953eada2a84830897dde5c1d;p=git.git diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 29d3faa55..31882abb8 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -3,7 +3,7 @@ git-merge-file(1) NAME ---- -git-merge-file - three-way file merge +git-merge-file - Run a three-way file merge SYNOPSIS