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

[James Blackwell]

On Thu, Feb 23, 2006 at 10:20:02AM -0500, Aaron Bentley wrote:
> -----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.

> +        return weave.weave_merge(plan, '<<<<<<< TREE\n', 
> +                                       '>>>>>>> MERGE-SOURCE\n')

Would it be possible to call it "LOCAL" and "REMOTE" rather than TREE and
MERGE-SOURCE? 

Otherwise, +1. 

-- 
My home page:   <a href="http://jblack.linuxguru.net">James Blackwell</a>
Gnupg 06357400  F-print AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060224/ceefa4c5/attachment.pgp