[MERGE REVIEW]: weave merge conflict markers customizable, standards-compliant

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

Emacs smerge doesn't like our weave conflict markers because they don't
have a space after the seven '<' or '>' signs.  And they're less
friendly because they don't have labels.  This patch makes the markers
customizable, puts an extra space in the defaults, and customizes our
output to have the TREE and MERGE-SOURCE labels.

I've committed it to http://code.aaronbentley.com/bzr/bzr.ttransform/

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD/dKi0F+nu1YWqI0RAqMIAJ4uLM2Zpb+3F+vPLg0Qq1eESWzAIwCdGW0w
Bu3sTQZ2+RqD6UwLPPvTdTo=
=VJtu
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-markers.patch
Type: text/x-patch
Size: 3326 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060223/404bee37/attachment.bin