X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=86aad37c6acaf0c37995221456bffc61ed3bc883;hb=6f4780f9dfd3bc6b23f9ea66b3d49577e0a0c2f9;hp=712739777b6c98449d2efdd5b6ce31724f3f5db6;hpb=7fe2fc79358673a909d71e62d3f80ffe0f525fce;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 ----