Mercurial Repositories > eric / file comparison
comparison: src/eric7/UI/CompareDialog.py
src/eric7/UI/CompareDialog.py
- branch
- eric7
- changeset 9786
- f94b530722af
- parent 9653
- e67609152c5e
- child 10303
- ee1aadab1215
equal
deleted
inserted
replaced
| 9785:84684a40187d | 9786:f94b530722af |
|---|---|
| 41 <li>line a -- line of sequence a</li> | 41 <li>line a -- line of sequence a</li> |
| 42 <li>lineno b -- linenumber of sequence b</li> | 42 <li>lineno b -- linenumber of sequence b</li> |
| 43 <li>line b -- line of sequence b</li> | 43 <li>line b -- line of sequence b</li> |
| 44 </ul> | 44 </ul> |
| 45 @ytype tuple of (str, str, str, str, str) | 45 @ytype tuple of (str, str, str, str, str) |
| 46 """ | 46 """ # __IGNORE_WARNING_D234r__ |
| 47 # __IGNORE_WARNING_D234r__ | 47 |
| 48 def removeMarkers(line): | 48 def removeMarkers(line): |
| 49 """ | 49 """ |
| 50 Internal function to remove all diff markers. | 50 Internal function to remove all diff markers. |
| 51 | 51 |
| 52 @param line line to work on (string) | 52 @param line line to work on (string) |
