![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Elijah Newren <newren@gmail.com> | |
| Mon, 20 Sep 2010 08:29:00 +0000 (02:29 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700) | ||
| commit | 07413c5a3115df424bee1ebe627676df0734f787 | |
| tree | 56f219a3148603c87166ac1a08516b88176378b0 | tree | snapshot |
| parent | 2a669c341a857f53d946dec762e6f22a54b12dd2 | commit | diff |
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>
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>
| merge-recursive.c | diff | blob | history | |
| t/t6022-merge-rename.sh | diff | blob | history |