Re: [PATCH] Remove uncontested renamed files during merge.

Hi,

On Wed, 13 Dec 2006, Shawn Pearce wrote:

Johannes Schindelin [off-list ref] wrote:

quoted

quoted

diff --git a/merge-recursive.c b/merge-recursive.c
index 9d53bcd..741d17f 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c

@@ -873,7 +873,7 @@ static int process_renames(struct path_list *a_renames,
 			struct diff_filespec src_other, dst_other;
 			int try_merge, stage = a_renames == renames1 ? 3: 2;
 
-			remove_file(1, ren1_src, 1);
+			remove_file(1, ren1_src, 0);

I _think_ that the "0" should be "!index_only".

Err, actually "index_only".  Since that's no_wd.

Oops. Correct. My memory starts failing me.

-->-- corrected patch follows --<--
Remove uncontested renamed files during merge.

Acked-by: Johannes Schindelin <redacted>

Ciao,
Dscho