From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Feb 2018 23:08:24 +0000 (-0800)
Subject: Merge branch 'en/merge-recursive-fixes' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c254292070e6e07902d4ac6fec5b94669920c6a5

Merge branch 'en/merge-recursive-fixes' into next

* 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
---

c254292070e6e07902d4ac6fec5b94669920c6a5