projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7ea3ddf
7a0e4d7
)
Merge branch 'jc/diff-merge-base-multi'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 16 Jul 2010 22:45:35 +0000
(15:45 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 16 Jul 2010 22:45:35 +0000
(15:45 -0700)
* jc/diff-merge-base-multi:
diff A...B: do not limit the syntax too narrowly
1
2
builtin/diff.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
builtin/diff.c
Simple merge