view tests/test-execute-bit.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.

adding a
79abf14474dc tip
% make sure we notice the change of mode if the cached size == -1
n   0         -1 unset               a
M a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d69afc33ff8a
not executable -- whew