[MERGE] remerge doesn't clobber unrelated conflicts

[Aaron Bentley]

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

Hi all,

This patch updates remerge so that remerging a file doesn't affect the
conflicts for other files.

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

iD8DBQFEpxVH0F+nu1YWqI0RAmSwAJ9at/k+x8BOZ2jOtOWjjocQlWYkRgCeOGio
LXDno+6oVWXweVPM3O1kss4=
=X2XM
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: remerge-conflicts.patch
Type: text/x-patch
Size: 5929 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060701/ef18c5bb/attachment.bin