Merge branch 'sb/merge-recursive-code-cleanup' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:09 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:09 +0000 (13:59 -0700)
commit4aaf5b0b21ac1fc294066593ac5243b3eaff897b
tree7285c1c971b3881c51e9cd05786bdae654342666
parent127c13aa41bdf3115561ae6e52313cfa278c35da
parentc2d4b4cd06f19e89ad242c2de542821edc01c01f
Merge branch 'sb/merge-recursive-code-cleanup' into maint

Code clean-up.

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