diff options
| author | Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:11:00 +0900 |
| commit | 18797a3b10e4077473740b953651b0032828d0fb (patch) | |
| tree | f47ccb5234057e94b141fa106e0363d8ac8b6e1c /replace-object.c | |
| parent | 64b1abe962b44e6bad84b980e8ea2811302e71c7 (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>
Diffstat (limited to 'replace-object.c')
0 files changed, 0 insertions, 0 deletions