[patch] weave merge conflict scope improvement

[Robert Collins]

For this one it might be nice to have a result of
        result = """\
            start context
<<<<<<< 
            int a() {}
=======
            int b() {}
=======
            int c() {}
>>>>>>> 
            end context
            """ 

Which is one of the output mode diff3 can generate.

Rob


On Fri, 2006-03-24 at 19:05 +0000, Martin Pool wrote:
> +        """
> +        base = """\
> +            start context
> +            int a() {}
> +            int b() {}
> +            int c() {}
> +            end context
> +            """
> +        a = """\
> +            start context
> +            int a() {}
> +            end context
> +            """
> +        b = """\
> +            start context
> +            int c() {}
> +            end context
> +            """
> +        result = """\
> +            start context
> +<<<<<<< 
> +            int a() {}
> +=======
> +            int c() {}
> +>>>>>>> 
> +            end context
> +            """ 
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060327/88cf1727/attachment.pgp