![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:20:15 +0000 (23:20 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700) | ||
| commit | 461f5041178c02f3360920f42b542df7add0033f | |
| tree | 1bab1604a7e0e9412cfd22681072a3d15b3af0a6 | tree | snapshot |
| parent | a99b7f2256ebd2d1db59c578f3da003e36f259c4 | commit | diff |
merge-recursive: Defer rename/rename(2to1) handling until process_entry
This puts the code for the different types of double rename conflicts
closer together (fewer lines of other code separating the two paths) and
increases similarity between how they are handled.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This puts the code for the different types of double rename conflicts
closer together (fewer lines of other code separating the two paths) and
increases similarity between how they are handled.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diff | blob | history |