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

[James Blackwell]

On Fri, Feb 24, 2006 at 05:18:07PM -0500, Aaron Bentley wrote:
> James Blackwell wrote:
> > On Thu, Feb 23, 2006 at 10:20:02AM -0500, Aaron Bentley wrote:
> 
> >>This patch ... customizes our
> >>output to have the TREE and MERGE-SOURCE labels.
> 
> > Would it be possible to call it "LOCAL" and "REMOTE" rather than TREE and
> > MERGE-SOURCE? 
> 
> I would prefer not to use local and remote, since we have no idea
> whether the merge source is remote or not.  For me, the merge source is
> typically a local mirror.
> 
> I'd rather use the locations of the branches.

I'd like that.

-- 
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/30377f40/attachment.pgp