diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:01 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:36 -0700 |
| commit | ed0148a520ec2ec88f0574c2e107aba0a46936e1 (patch) | |
| tree | 3566f61d08552b0022f7e75bc6bf548f17d93c6a /t/t4013/diff.diff_--patch-with-stat_initial..side | |
| parent | 86d4b528d8a4752cc689279fb6d38c8697a507bb (diff) | |
| download | git-ed0148a520ec2ec88f0574c2e107aba0a46936e1.tar.gz git-ed0148a520ec2ec88f0574c2e107aba0a46936e1.zip | |
merge-recursive: Allow make_room_for_path() to remove D/F entries
If there were several files conflicting below a directory corresponding
to a D/F conflict, and the file of that D/F conflict is in the way, we
want it to be removed. Since files of D/F conflicts are handled last,
they can be reinstated later and possibly with a new unique name.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_--patch-with-stat_initial..side')
0 files changed, 0 insertions, 0 deletions