Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'en/merge-directory-renames-fix'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 6 Jun 2019 21:03:36 +0000
(14:03 -0700)
committer
Junio 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
raw
|
combined
(merge:
74583d8
481de8a
)
diff --cc
merge-recursive.c
Simple merge