X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=a007a8b15a1a4598aabd844d09e45db65db6e3a5;hb=69779a562a171d9b70bbb17b89e076bd6b16ae6c;hp=dca363dd5ec7022d605d5730be65e6066072de1d;hpb=dbc37438687e110697574d175e4eca5f9cbeae81;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 ----