diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-31 12:57:56 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-31 13:11:36 +0000 |
| commit | 3e073d8552f04933e7d70b177c263c2a893f98f9 (patch) | |
| tree | 5b1adf19450bb3939a6cc5ef9233b4c2b78daa5c /tests.merging/conflict-chunks.script | |
| parent | 46f84d361f813748231034265c54389b9f9b84c3 (diff) | |
| download | morph-3e073d8552f04933e7d70b177c263c2a893f98f9.tar.gz | |
Fix mistake in renaming tests that breaks ./check on Squeeze
Diffstat (limited to 'tests.merging/conflict-chunks.script')
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index 98efcc3e..3c5ecb04 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.script @@ -22,8 +22,8 @@ set -eu # Disable test on versions of Python before 2.7. if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null then - cat "$SRCDIR/tests.branching/merge-conflict-chunks.stdout" - cat "$SRCDIR/tests.branching/merge-conflict-chunks.stderr" >&2 + cat "$SRCDIR/tests.merging/conflict-chunks.stdout" + cat "$SRCDIR/tests.merging/conflict-chunks.stderr" >&2 exit 0 fi |