Mercurial > hg
comparison tests/test-bookmarks-current @ 12046:8e7960feb139 stable
Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".
Now conflict markers inside the file are found, too.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 26 Aug 2010 17:38:43 +0200 |
| parents | e5aaaef91a27 |
| children |
comparison
equal
deleted
inserted
replaced
| 12039:18e1e7520b67 | 12046:8e7960feb139 |
|---|