[rfc] [patch] new merge tests suggested by Aaron

[Aaron Bentley]

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

duchier at ps.uni-sb.de wrote:
> Hi Aaron,
> 
> I converted the 5 cases you described yesterday into new additions to
> the test suite.  Could please have a look at these tests to verify
> that I have correctly interpreted your intent.  Bzr of course passes
> with flying colors.

Thanks for doing this.  I can't see a difference between case 5 and case
2, either in the list of operations or in the code.  Other than that, it
looks good.

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

iD8DBQFDpr1j0F+nu1YWqI0RAt1mAJ9y363Kpe8n7edXuW2LdOScwoxvQQCfVtM0
ShMKWFyavQoIQ+hzdfFePmE=
=Mbap
-----END PGP SIGNATURE-----