X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=f35d0e1b4560a4970e7423011b585e1ff7d538c1;hb=82527cf33e59308b86cf3defe9ae0f5c2367a012;hp=86aad37c6acaf0c37995221456bffc61ed3bc883;hpb=38ebbacd93eb547b3608b64a2efc60fd79e1ea85;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 86aad37c6..f35d0e1b4 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 @@ -27,4 +27,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list