svn merge http://localhost/svn/testrepo/trunk/
— Merging r6 through r8 into '.':
C index.php
— Recording mergeinfo for merge of r6 through r8 into '.':
U .
Conflict discovered in file 'index.php'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: