Conflict editing

[Andrew Nguyen]

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 187 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061208/94aba4d0/attachment.pgp