projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a8b7fcf
c008c0f
)
Merge branch 'jc/diff-merge-base-multi'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Jul 2010 19:08:25 +0000
(12:08 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Jul 2010 19:08:25 +0000
(12:08 -0700)
* jc/diff-merge-base-multi:
diff A...B: give one possible diff when there are more than one merge-base
1
2
builtin/diff.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
builtin/diff.c
Simple merge