X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=f80ab3b8c479d787e116298f5446d1ff57ff2774;hb=9e2163ea45b688e9de4744ebb9b01ea7e1ed8d56;hp=712739777b6c98449d2efdd5b6ce31724f3f5db6;hpb=348c4c66dacb1810a9bcd592e72f98a465233488;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 712739777..f80ab3b8c 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -1,10 +1,9 @@ git-merge-one-file(1) ===================== -v0.99.4, Aug 2005 NAME ---- -git-merge-one-file - The standard helper program to use with "git-merge-index" +git-merge-one-file - The standard helper program to use with git-merge-index SYNOPSIS