projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e0052f4) | patch
merge-recursive: fix remaining directory rename + dirty overwrite cases
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:52:03 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commitbbafab7f326146dc9a8bcf42071574dc22fbed5e
treec8a87fce54e45b7e30db9c0028af009098cb6cf9tree | snapshot
parente0052f4613cd8f586b0b9975fedffce268ca6ce9commit | diff
merge-recursive: fix remaining directory rename + dirty overwrite cases

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | blame | history
t/t6043-merge-rename-directories.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.