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

[Martin Pool]

On Thu, 2006-02-23 at 10:20 -0500, Aaron Bentley wrote:

> 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/

Yes, +1 from me too.

(Though this diff does seem to indicate that we don't have tests which
examine the working directory after a conflicted full-tree merge, and
perhaps we should.)

-- 
Martin

-------------- 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/20060224/b43ea8bd/attachment.pgp