[bzrtools:MERGE] Fix erroring test, the right way.

[Vincent Ladeuil]

>>>>> "aaron" == Aaron Bentley <aaron at aaronbentley.com> writes:

    aaron> Vincent Ladeuil wrote:
    >> I was surprised when the test failed, but far less surprised than
    >> when I thought I fixed it and realized it was failing in another
    >> way.
    >> 
    >> Moral: never ever tweak after selftest or face the consequences.

    aaron> Your patch isn't against the latest version of bzrtools and doesn't
    aaron> apply cleanly.  Please update and see if it's still necessary.

I'm using
http://bazaar.launchpad.net/~abentley/bzrtools/bzrtools.dev/ (aka
lp:bzrtools) at revision 642, isn't that the latest ???

             Vincent