Mercurial > hg

diff tests/test-doctest.py @ 12046:8e7960feb139 stable

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 0f3c8a47960e
children b7fbf24c8a93 bb324910e40a
line wrap: on
line diff