Merge branch 'sb/merge-recursive-code-cleanup' into maint
authorJunio C Hamano <redacted>
Mon, 10 Jul 2017 20:59:09 +0000 (13:59 -0700)
committerJunio C Hamano <redacted>
Mon, 10 Jul 2017 20:59:09 +0000 (13:59 -0700)
Code clean-up.

* sb/merge-recursive-code-cleanup:
  merge-recursive: use DIFF_XDL_SET macro


Trivial merge
git clone https://git.99rst.org/PROJECT