tokkee.org
Code
projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ja/shorthelp'
[git.git]
/
Documentation
/
git-merge-tree.txt
diff --git
a/Documentation/git-merge-tree.txt
b/Documentation/git-merge-tree.txt
index 35fb4fb713bac225c665b6d7701efc9f105b9c16..6892fdac3df054e87019318c524185109ea16200 100644
(file)
--- a/
Documentation/git-merge-tree.txt
+++ b/
Documentation/git-merge-tree.txt
@@
-34,4
+34,3
@@
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the gitlink:git[7] suite
-