Checked out revision 0.
A         trunk
A         branches
Adding         branches
Adding         trunk

Committed revision 1.
A         trunk/test.c
Adding         trunk/test.c
Transmitting file data .
Committed revision 2.
A         branches/b1
Adding         branches/b1
Adding         branches/b1/test.c

Committed revision 3.
A         branches/b1/subdir
Adding         branches/b1/subdir

Committed revision 4.
A         branches/b1/subdir/test.c
Adding         branches/b1/subdir/test.c
Transmitting file data .
Committed revision 5.
This merge should give a conflict but it does not
A    test.c
<<<<<<< .working
hello
=======
Hello
>>>>>>> .merge-right.r5