When editing the raw-merged document (in the work area), you should see output similar to the following:
<<<<<<< 1.2.1.1
Original line #1
branch change
Original line #2
=======
Original line #1
trunk change
Original line #2
>>>>>>> 1.3
For conflicting sections, the merged document contains both the original sections from the branch (1.2.1.1) and from the trunk (1.3) separated by ======= . Using your text editor, merge the conflicting sections and remove the conflict separators.