Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/merge-recursive-code-cleanup'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 7 Jul 2017 01:14:45 +0000
(18:14 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 7 Jul 2017 01:14:45 +0000
(18:14 -0700)
Code clean-up.
* sb/merge-recursive-code-cleanup:
merge-recursive: use DIFF_XDL_SET macro
1
2
merge-recursive.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
f9b3252
c2d4b4c
)
diff --cc
merge-recursive.c
Simple merge