[MERGE] remerge doesn't clobber unrelated conflicts

[John Arbash Meinel]

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

Aaron Bentley wrote:

...

> When we invoke transform_tree, those files return to their original,
> unconflicted state.  So clearing the conflicts on those files seems
> reasonable to me.

Except it may be the wrong unconflicted state. (Since they aren't merged).

I'm okay with it, just not 100%.

However, remerge does set them properly if they stay conflicted, and I'm
not sure how to give the right information around that these files have
been 'fixed'. So +1 from me.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEpzNgJdeBCYSNAAMRAi1NAKDQ8WcpFj97Mk/T9hV3hfmos0rkuACdFslD
wZbUCz+VW0Xg+Ee+ptfwvsg=
=8CQT
-----END PGP SIGNATURE-----