Merge branch 'sb/merge-recursive-code-cleanup' into maint

Code clean-up. * sb/merge-recursive-code-cleanup: merge-recursive: use DIFF_XDL_SET macro

Junio C Hamano committed Jul 10, 2017 at 13:59 UTC 4aaf5b0b21ac1fc294066593ac5243b3eaff897b

No changes.