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

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

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..

text/plain attachment: dry_run_merge_conflicting_binary_test.patch.txt

text/plain attachment: dry_run_merge_conflicting_binary_test.log.txt

Received on 2011-03-11 16:03:51 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: "[PATCH] Add a test to cover the regression introduced in r1075802"
In reply to: Arwin Arni: "[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"
Reply: C. Michael Pilato: "Re: [PATCH] Add a test to cover the regression introduced in r1075802"
Reply: 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 ]