17:56:51 test>svn co svn://marvin/test/deli
Checked out revision 385.

17:56:58 test>mkdir deli\trunk

17:57:10 test>svn add deli\trunk
A         deli\trunk

17:57:16 test>copy con deli\trunk\sandwich.txt
Top piece of bread
Mayonnaise
Lettuce
Tomato
Provolone
Creole Mustard
Bottom piece of bread
^Z
        1 file(s) copied.

17:57:40 test>svn add deli\trunk\sandwich.txt
A         deli\trunk\sandwich.txt

17:57:50 test>svn ci -m "" deli
Adding         deli\trunk
Adding         deli\trunk\sandwich.txt
Transmitting file data .
Committed revision 386.

17:57:59 test>svn cp deli\trunk deli\branch
A         deli\branch

17:58:28 test>svn ci -m "" deli
Adding         deli\branch

Committed revision 387.

17:59:54 test>notepad deli\trunk\sandwich.txt

18:01:17 test>svn ci -m "" deli
Sending        deli\trunk\sandwich.txt
Transmitting file data .
Committed revision 388.

18:01:46 test>notepad deli\branch\sandwich.txt

18:02:33 test>svn ci -m "" deli
Sending        deli\branch\sandwich.txt
Transmitting file data .
Committed revision 389.

18:03:07 test>svn merge -r 386:389 svn://marvin/test/deli/trunk deli/branch
C    deli\branch\sandwich.txt

18:04:35 test>notepad deli\branch\sandwich.txt

18:05:14 test>svn resolved deli\branch\sandwich.txt
Resolved conflicted state of 'deli\branch\sandwich.txt'

18:11:56 test>notepad deli\branch\sandwich.txt

18:15:56 test>svn ci -m "" deli
Sending        deli\branch\sandwich.txt
Transmitting file data .
Committed revision 390.

18:18:51 test>svn merge -r 387:390 svn://marvin/test/deli/branch deli/trunk
C    deli\trunk\sandwich.txt

18:19:29 test>