From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 May 2016 21:08:12 +0000 (-0700)
Subject: Merge branch 'en/merge-fixes'
X-Git-Tag: v2.9.0-rc0~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10b8084ee1be90227dff570fee8a57d183e7ae07;p=git

Merge branch 'en/merge-fixes'

"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.

* en/merge-fixes:
  merge-recursive: do not check working copy when creating a virtual merge base
  merge-recursive: remove duplicate code
---

10b8084ee1be90227dff570fee8a57d183e7ae07