X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=f80ab3b8c479d787e116298f5446d1ff57ff2774;hb=5cb71f82de7fc370dfcd7aad505c36d89e8fec5d;hp=86aad37c6acaf0c37995221456bffc61ed3bc883;hpb=4ae22d96fe9248dac4f26b1fc91154ba5e879799;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 86aad37c6..f80ab3b8c 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -3,7 +3,7 @@ git-merge-one-file(1) 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