Mercurial > hg

view tests/test-issue1089.out @ 12045:1e8c7999af86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2268edff1bec
children
line wrap: on
line source

adding a/b
removing a/b
adding a/b
removing a/b