From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:59:09 +0000 (-0700)
Subject: Merge branch 'sb/merge-recursive-code-cleanup' into maint
X-Git-Tag: v2.13.3~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4aaf5b0b21ac1fc294066593ac5243b3eaff897b;p=thirdparty%2Fgit.git

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

Code clean-up.

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

4aaf5b0b21ac1fc294066593ac5243b3eaff897b