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

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.

% reverting to rev 0
reverting foo
M foo
diff --git a/foo b/foo
old mode 100755
new mode 100644