Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Fix push with refspecs containing wildcards
[gitweb.git]
/
Documentation
/
git-mergetool.txt
diff --git
a/Documentation/git-mergetool.txt
b/Documentation/git-mergetool.txt
index add01e855a09c34b6aa9c83af6efcd17f24f3c9d..b89c51c65b78e38c99a29f8e0b330039d1421ec2 100644
(file)
--- a/
Documentation/git-mergetool.txt
+++ b/
Documentation/git-mergetool.txt
@@
-43,4
+43,3
@@
Documentation by Theodore Y Ts'o.
GIT
---
Part of the gitlink:git[7] suite
-