projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3b130ad) | patch
merge-recursive: Delay content merging for renames
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:03 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700)
commit882fd11aff6f0e8add77e75924678cce875a0eaf
treeafdfb547ff6ad755596808098986c20a31755a37tree | snapshot
parent3b130adf9c8b0b37acb0959b84a3222bc22ebcffcommit | diff
merge-recursive: Delay content merging for renames

Move the handling of content merging for renames 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
Git—the stupid content tracker