Home » Mailing list archives » git » 2008 » November » 10

Re: [PATCH] 3-way merge with file move fails when diff.renames = copies

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Johannes Schindelin <Johannes.Schindelin@...>
To: David D. Kilzer <ddkilzer@...>
Cc: <git@...>, <gitster@...>
Subject: Re: [PATCH] 3-way merge with file move fails when diff.renames = copies
Date: Monday, November 10, 2008 - 7:41 pm

Hi,

except for the commit subject I like it, especially the commit body. So:

s/(3-way.*) fails/Fix &/

Ciao,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] 3-way merge with file move fails when diff.renames =..., David D. Kilzer, (Mon Nov 10, 6:26 pm)
Re: [PATCH] 3-way merge with file move fails when diff.renam..., Junio C Hamano, (Mon Nov 10, 7:49 pm)
Re: [PATCH] 3-way merge with file move fails when diff.renam..., Junio C Hamano, (Mon Nov 10, 8:15 pm)
Re: [PATCH] 3-way merge with file move fails when diff.renam..., Johannes Schindelin, (Mon Nov 10, 7:41 pm)
[PATCH] Fix 3-way merge with file move when diff.renames = c..., David D. Kilzer, (Mon Nov 10, 7:53 pm)