]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a4fd114 8020504)
Merge branch 'en/merge-path-collision'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Mar 2020 18:21:20 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Mar 2020 18:21:20 +0000 (11:21 -0700)
commitd1075adfdf2d2008d665dc57b37c1f027f4ffd42
tree517868b34eae7b044ce1fdeb5c885f4f134e4e6ftree | snapshot
parenta4fd114ffca1e3c5fff48df382298c2ef9a32f67commit | diff
parent802050400a51270bd2b4a13e410412693975c766commit | diff
Merge branch 'en/merge-path-collision'

Handling of conflicting renames in merge-recursive have further
been made consistent with how existing codepaths try to mimic what
is done to add/add conflicts.

* en/merge-path-collision:
  merge-recursive: apply collision handling unification to recursive case
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.