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

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Fri, 11 Mar 2011 10:37:10 -0500

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 <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

application/pgp-signature attachment: OpenPGP digital signature

Received on 2011-03-11 16:37:57 CET

This message: [ Message body ]
Next message: C. Michael Pilato: "Re: [PATCH] Add a test to cover the regression introduced in r1075802"
Previous message: Arwin Arni: "Re: [PATCH] Add a test to cover the regression introduced in r1075802"
In reply to: Arwin Arni: "Re: [PATCH] Add a test to cover the regression introduced in r1075802"
Next in thread: C. Michael Pilato: "Re: [PATCH] Add a test to cover the regression introduced in r1075802"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]