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

[John Arbash Meinel]

Aaron Bentley wrote:
> 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

I don't really care about Emac's smerge, but +1 to having the TREE and
MERGE-SOURCE labels back in. (so +1 overall)

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060223/e63ed3cd/attachment.pgp