summaryrefslogtreecommitdiff
path: root/tests/test-merge10.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-merge10.t')
-rw-r--r--tests/test-merge10.t2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/test-merge10.t b/tests/test-merge10.t
index 0ac57f4..96bd416 100644
--- a/tests/test-merge10.t
+++ b/tests/test-merge10.t
@@ -49,5 +49,3 @@ but then local changes are added in the same directory)
@@ -1,1 +1,1 @@
-a
+alpha
-
- $ cd ..