From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Feb 2018 22:55:40 +0000 (-0800)
Subject: Merge branch 'en/merge-recursive-fixes'
X-Git-Tag: v2.17.0-rc0~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae0d0795d736467202d9bfd535942be81529f84e;p=thirdparty%2Fgit.git

Merge branch 'en/merge-recursive-fixes'

* en/merge-recursive-fixes:
  merge-recursive: add explanation for src_entry and dst_entry
  merge-recursive: fix logic ordering issue
  Tighten and correct a few testcases for merging and cherry-picking
---

ae0d0795d736467202d9bfd535942be81529f84e