[darcs-users] darcs patch: Minor style tweaks in cabal test. (and 12 more)
Trent W. Buck
twb at cybersource.com.au
Fri Aug 28 02:34:23 UTC 2009
On Mon, Aug 24, 2009 at 11:52:16AM +0100, Eric Kow wrote:
> On Mon, Aug 24, 2009 at 14:19:30 +1000, Trent W. Buck wrote:
>> Duplicated tests? I think this is a merge conflict problem that
>> probably needs to be resolved by removing either these, or the
>> duplicated failing- ones. Eric, do you know which ones to keep?
>
> I've removed the failing variants in these in a separate patch that
> I'm sending now (hmm, perhaps I should amend my conflict-resolution
> instead?)
>
>> Unaccounted-for deletions, insertions and modifications. I need to
>> examine the changes to these more closely.
>
> [Explanations...]
OK, everything checks out. Applied, thanks!
More information about the darcs-users
mailing list