44 <li>line a -- line of sequence a</li> |
44 <li>line a -- line of sequence a</li> |
45 <li>lineno b -- linenumber of sequence b</li> |
45 <li>lineno b -- linenumber of sequence b</li> |
46 <li>line b -- line of sequence b</li> |
46 <li>line b -- line of sequence b</li> |
47 </ul> |
47 </ul> |
48 @ytype tuple of (str, str, str, str, str) |
48 @ytype tuple of (str, str, str, str, str) |
49 """ # __IGNORE_WARNING_D234r__ |
49 """ # __IGNORE_WARNING_D-234r__ |
50 |
50 |
51 def removeMarkers(line): |
51 def removeMarkers(line): |
52 """ |
52 """ |
53 Internal function to remove all diff markers. |
53 Internal function to remove all diff markers. |
54 |
54 |