Conflicts (3/5)

• The conflicts are delimited by the <<<<<<< .mine [...] ======= [...] >>>>>>> .r11

• The “.mine” after the row of less-thans indicates that the section up until the equal signs is from the working copy

• The “.r11” after the row of greater-thans indicates that the section above is from revision 11

• Simply merge the two together to get what you want, then removed the lines containing the less-thans, greater-thans, and equal signs

Notes: