[MERGE] remerge doesn't clobber unrelated conflicts

[Aaron Bentley]

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

Martin Pool wrote:
> Robert has said that (expected, actual) is the recommended practice for
> pyunit, or perhaps for all unittest-related frameworks.  I tend to agree
> that (actual, expected) feels more natural somehow but I do think we
> should be consistent.

Okay.  As it happens, I did switch the tests to (expected, actual)
before I submitted, and I'll do that in the future.

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

iD8DBQFEqf120F+nu1YWqI0RAt+rAJ4iPUGocyABLm/EF5JfHPfShNog1wCbB+0n
WPrh7fd1gjRGZ0wUBtk74E0=
=IVNj
-----END PGP SIGNATURE-----