I'm having trouble getting the patch to apply cleanly, but don't sweat it -- I'll apply it by hand.
On 03/11/2011 10:03 AM, Arwin Arni wrote: > On Friday 11 March 2011 08:26 PM, Arwin Arni wrote: >> 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 > Sorry, forgot the attachments.. -- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Distributed Development On Demand
signature.asc
Description: OpenPGP digital signature
