diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 10:52:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 14:11:58 -0800 |
| commit | bbafab7f326146dc9a8bcf42071574dc22fbed5e (patch) | |
| tree | c8a87fce54e45b7e30db9c0028af009098cb6cf9 /commit.c | |
| parent | merge-recursive: fix overwriting dirty files involved in renames (diff) | |
| download | git-bbafab7f326146dc9a8bcf42071574dc22fbed5e.tar.gz git-bbafab7f326146dc9a8bcf42071574dc22fbed5e.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions