Re: [PATCH] Fix regression introduced in r1075802

2011-03-14 Thread Stefan Sperling
On Tue, Mar 15, 2011 at 07:33:06AM +1000, Daniel Becroft wrote: > Hi, > > Below is a patch that fixes the regression introduced in r1075802. THe > thread related to this regress can > be found here: http://svn.haxx.se/dev/archive-2011-03/0145.shtml. > > Cheers, > Daniel B. > > [[[ > Fix regressi

[PATCH] Fix regression introduced in r1075802

2011-03-14 Thread Daniel Becroft
Hi, Below is a patch that fixes the regression introduced in r1075802. THe thread related to this regress can be found here: http://svn.haxx.se/dev/archive-2011-03/0145.shtml. Cheers, Daniel B. [[[ Fix regression introduced in r1075802, where conflict files were created during a dry-run merge.