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

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

Junio C Hamano committed Jul 6, 2017 at 18:14 UTC 2f4bcd8b70041627abdf7811acb67cc8e7bee574

No changes.