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