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

[Martin Pool]

On 15 Dec 2005, 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.

+1, when John's formatting suggestions are done.

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051216/cdd7217c/attachment.pgp