X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=ee95df3bc07874bb74b77899f113830b943066f6;hb=f7ff09d7188aaa60710aa2e6d0da19b70adac2f1;hp=f35d0e1b4560a4970e7423011b585e1ff7d538c1;hpb=f8db7884286232274c8e7c7d82a35a2478b097d3;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index f35d0e1b4..ee95df3bc 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -26,4 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list