Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Add support for pushing to a remote repository using HTTP/DAV
[gitweb.git]
/
Documentation
/
git-merge.txt
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index da6537d9110ced743c42cba99111923a0753eb6d..3e058db996cbb1200fc304b3a090cbd4e13fce80 100644
(file)
--- a/
Documentation/git-merge.txt
+++ b/
Documentation/git-merge.txt
@@
-37,7
+37,7
@@
include::merge-pull-opts.txt[]
SEE ALSO
--------
-gitlink:git-fmt-merge-msg[1]
+gitlink:git-fmt-merge-msg[1]
, gitlink:git-pull[1]
Author