view tests/test-diffstat.out @ 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.

% wide diffstat
 a |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 213 insertions(+), 0 deletions(-)
% diffstat width
 a |  213 ++++++++++++++
 1 files changed, 213 insertions(+), 0 deletions(-)
% narrow diffstat
 a |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
% binary diffstat
 b |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)
% binary git diffstat
 b |  Bin 
 1 files changed, 0 insertions(+), 0 deletions(-)