[patch] new test for merging with swapped filenames

[duchier at ps.uni-sb.de]

A non-text attachment was scrubbed...
Name: test_merge.patch
Type: text/x-patch
Size: 1711 bytes
Desc: new merge tests
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051214/039ab140/attachment.bin