From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Jul 2017 01:14:45 +0000 (-0700)
Subject: Merge branch 'sb/merge-recursive-code-cleanup'
X-Git-Tag: v2.14.0-rc0~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f4bcd8b70041627abdf7811acb67cc8e7bee574;p=thirdparty%2Fgit.git

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

Code clean-up.

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

2f4bcd8b70041627abdf7811acb67cc8e7bee574