Conflict editing

[Erik Bågfors]

Check out the extmerge plugin. I think I have it at
http://erik.bagfors.nu/bzr-plugins/extmerge/

It might do what you want, but I haven't used it in ages myself.

/Erik


On 12/8/06, Andrew Nguyen <avnguyen at alumni.ucsd.edu> wrote:
> I was wondering if anyone had suggestions for a tool to simplify
> conflict editing - i.e. parse out the <<< >>> and ===.  I did some
> searching and haven't found anything except for a Vim plugin but the Vim
> site seems to be not working properly.  Didn't know if anyone had any
> other suggestions.  I would be using this on either linux or windows.
>
> Thanks,
> Andrew
>
>
>
>


-- 
google talk/jabber. zindar at gmail.com
SIP-phones: sip:erik_bagfors at gizmoproject.com
sip:17476714687 at proxy01.sipphone.com