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

[Aaron Bentley]

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

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.

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

iD8DBQFD/4Ye0F+nu1YWqI0RArtQAJ4tWfg6QXhwM2xi4sShpX4W1juTmQCfcYWF
Prpj36fEOBvVa3dQ6IgPZZc=
=sweT
-----END PGP SIGNATURE-----