diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:00 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:04 -0700 |
| commit | 07413c5a3115df424bee1ebe627676df0734f787 (patch) | |
| tree | 56f219a3148603c87166ac1a08516b88176378b0 /t/t1004-read-tree-m-u-wf.sh | |
| parent | merge-recursive: Avoid doubly merging rename/add conflict contents (diff) | |
| download | tgif-07413c5a3115df424bee1ebe627676df0734f787.tar.xz | |
merge-recursive: Move handling of double rename of one file to two
Move the handling of rename/rename conflicts where one file is renamed to
two different files, from process_renames() to process_df_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1004-read-tree-m-u-wf.sh')
0 files changed, 0 insertions, 0 deletions