| commit | 10b8084ee1be90227dff570fee8a57d183e7ae07 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 May 2016 21:08:12 +0000 (3 14:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 May 2016 21:08:12 +0000 (3 14:08 -0700) | ||
| tree | 0f9ec14826b2bb775183faa7fc479b2c17a9c00e | treesnapshot (tar.gz zip) |
| parent | ee88674f24151fe5c6cd6ccd3c1a6cd972b2adc0 | commitdiff |
| parent | 8e1b62f174bb53f5fb7cf027f9c426d0c6864003 | commitdiff |
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
"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