Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ap/maint-merge-strategy-list-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Thu, 3 Dec 2009 21:54:11 +0000
(13:54 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 3 Dec 2009 21:54:11 +0000
(13:54 -0800)
* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.
1
2
builtin-merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
78b77c4
ed87465
)
diff --cc
builtin-merge.c
Simple merge