Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: describe 'union' low-level merge driver
[gitweb.git]
/
Documentation
/
git-sh-setup.txt
diff --git
a/Documentation/git-sh-setup.txt
b/Documentation/git-sh-setup.txt
index 2b2abebd608be337db35a3de4b83d37d43061acb..1ea1faa1b57adecea4269fa6d0c2c4afdee9b3da 100644
(file)
--- a/
Documentation/git-sh-setup.txt
+++ b/
Documentation/git-sh-setup.txt
@@
-69,4
+69,3
@@
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the gitlink:git[7] suite
-