[darcs-users] darcs patch: Demonstrate conflict fight bug #817 (and 1 more)

[David Roundy]

On Wed, May 07, 2008 at 01:00:58PM +0000, E.Y.Kow at brighton.ac.uk wrote:
> Wed May  7 12:36:47 BST 2008  Pekka Pessi <first.last at nokia.com>
>   * Demonstrate conflict fight bug #817
>   
>   Too deep conflict fight ends with Inconsistent patch w/ conflictor.
>   
>   Use make bugs_shell_format2 for demonstration.
>   
> 
> Wed May  7 14:00:33 BST 2008  Eric Kow <E.Y.Kow at brighton.ac.uk>
>   * Canonize Pekka Pessi.

Applied.  Thanks!

David