Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
[gitweb.git]
/
Documentation
/
git-merge-tree.txt
diff --git
a/Documentation/git-merge-tree.txt
b/Documentation/git-merge-tree.txt
index b785e0f6e0c02ef688d4c6a60e19939aafd1a8d3..dbb0c18668ff0fb60c31c12b02c27d92b430c24a 100644
(file)
--- a/
Documentation/git-merge-tree.txt
+++ b/
Documentation/git-merge-tree.txt
@@
-8,7
+8,7
@@
git-merge-tree - Show three-way merge without touching index
SYNOPSIS
--------
-'git
-
merge-tree' <base-tree> <branch1> <branch2>
+'git
merge-tree' <base-tree> <branch1> <branch2>
DESCRIPTION
-----------