X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=86aad37c6acaf0c37995221456bffc61ed3bc883;hb=d5a6aafc90a14382120727e4e81ee1a380e8b194;hp=712739777b6c98449d2efdd5b6ce31724f3f5db6;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 71273977..86aad37c 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -1,6 +1,5 @@ git-merge-one-file(1) ===================== -v0.99.4, Aug 2005 NAME ----