X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=86aad37c6acaf0c37995221456bffc61ed3bc883;hb=4ae22d96fe9248dac4f26b1fc91154ba5e879799;hp=712739777b6c98449d2efdd5b6ce31724f3f5db6;hpb=a7154e916c6fab01dfb67629dae8c4430daff669;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 712739777..86aad37c6 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 ----