Mercurial > hg
view tests/test-inotify-lookup @ 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 | f5c18a581b8b |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" inotify || exit 80 hg init echo "[extensions]" > .hg/hgrc echo "inotify=" >> .hg/hgrc hg inserve -d --pid-file .hg/inotify.pid echo a > a hg ci -Aqm0 hg co -q null hg co -q hg st cat a kill `cat .hg/inotify.pid`