My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74583d8 481de8a)
Merge branch 'en/merge-directory-renames-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2019 21:03:36 +0000 (14:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2019 21:03:36 +0000 (14:03 -0700)
Recent code restructuring of merge-recursive engine introduced a
regression dealing with rename/add conflict.

* en/merge-directory-renames-fix:
  merge-recursive: restore accidentally dropped setting of path

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
The core git plumbing