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

[PATCH] Add a test to cover the regression introduced in r1075802

From: Arwin Arni <arwin_at_collab.net>
Date: Fri, 11 Mar 2011 20:26:40 +0530

Hi All,

This patch adds a test to make sure that conflict resolution files are
not created in the event of a *dry-run* merge that has binary file
conflicts.

The relevant discussion on dev@ is here ->
http://svn.haxx.se/dev/archive-2011-03/0145.shtml

Regards,
Arwin Arni
Received on 2011-03-11 16:03:28 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.