diff options
Diffstat (limited to 'tests.branching/merge-conflict-stratum.script')
| -rwxr-xr-x | tests.branching/merge-conflict-stratum.script | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests.branching/merge-conflict-stratum.script b/tests.branching/merge-conflict-stratum.script index 76e3309e..8f0a3170 100755 --- a/tests.branching/merge-conflict-stratum.script +++ b/tests.branching/merge-conflict-stratum.script @@ -21,7 +21,9 @@ set -eu # Disable test on versions of Python before 2.7. if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null then - exit 0 + cat "$SRCDIR/tests.branching/merge-conflict-stratum.stdout" + cat "$SRCDIR/tests.branching/merge-conflict-stratum.stderr" >&2 + exit 1 fi cd "$DATADIR/workspace" |