X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=a007a8b15a1a4598aabd844d09e45db65db6e3a5;hb=6d0de319d6249096fe934317e937177d07b1b84f;hp=dca363dd5ec7022d605d5730be65e6066072de1d;hpb=7fe2fc79358673a909d71e62d3f80ffe0f525fce;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index dca363dd..a007a8b1 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -1,6 +1,5 @@ git-merge(1) ============ -v0.99.6, Sep 2005 NAME ----