Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Add "-l" flag for repacking only local packs
[gitweb.git]
/
Documentation
/
git-merge.txt
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index dca363dd5ec7022d605d5730be65e6066072de1d..a007a8b15a1a4598aabd844d09e45db65db6e3a5 100644
(file)
--- a/
Documentation/git-merge.txt
+++ b/
Documentation/git-merge.txt
@@
-1,6
+1,5
@@
git-merge(1)
============
-v0.99.6, Sep 2005
NAME
----