[patch] new merge tests suggested by Aaron

[Denys Duchier]

>> Do you have this branch publicly available so that I can 'bzr merge'
>> rather than using patch?
>
> Not at the moment, but I need to do something about that soonish

I now have apache running on my office machine and my branch, with the
new tests for the selftest suite, is mirrored at:

         http://delta.univ-orleans.fr/~duchier/bzr/bzr.tests

The two revisions you may be interested in are 1492, 1493

Cheers,

--Denys