[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Pass the name of the conflicted file to the merge tool

From: John Gardiner Myers <jgmyers_at_proofpoint.com>
Date: Fri, 16 Jan 2009 09:34:58 -0800

My proposed patch does not modify the behavior of the external diff or
external diff3 commands. I do not consider it reasonable to require me
to extend the scope of the patch to modify the the behavior of these
other mechanisms, taking on the much less tractable compatibility
requirements of these other mechanisms.

My proposed patch should be applied as-is.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1029260
Received on 2009-01-16 18:54:38 CET

This is an archived mail posted to the Subversion Dev mailing list.