]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ee88674 8e1b62f)
Merge branch 'en/merge-fixes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 May 2016 21:08:12 +0000 (14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 May 2016 21:08:12 +0000 (14:08 -0700)
commit10b8084ee1be90227dff570fee8a57d183e7ae07
tree0f9ec14826b2bb775183faa7fc479b2c17a9c00etree | snapshot
parentee88674f24151fe5c6cd6ccd3c1a6cd972b2adc0commit | diff
parent8e1b62f174bb53f5fb7cf027f9c426d0c6864003commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.