projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a99b7f2) | patch
merge-recursive: Defer rename/rename(2to1) handling until process_entry
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:15 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700)
commit461f5041178c02f3360920f42b542df7add0033f
tree1bab1604a7e0e9412cfd22681072a3d15b3af0a6tree | snapshot
parenta99b7f2256ebd2d1db59c578f3da003e36f259c4commit | 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>
merge-recursive.c diff | blob | history
Git—the stupid content tracker