Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] fetch.c: Make process() look at each object only once
[gitweb.git]
/
Documentation
/
git-merge.txt
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index a48697ff3484d075669e77366de35727c2017e7a..dca363dd5ec7022d605d5730be65e6066072de1d 100644
(file)
--- a/
Documentation/git-merge.txt
+++ b/
Documentation/git-merge.txt
@@
-49,4
+49,4
@@
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
-Part of the
link:git.html[git
] suite
+Part of the
gitlink:git[7
] suite