summaryrefslogtreecommitdiffstats
path: root/test/integration/rebase2/test.json
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration/rebase2/test.json')
-rw-r--r--test/integration/rebase2/test.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/integration/rebase2/test.json b/test/integration/rebase2/test.json
deleted file mode 100644
index e6d67fff1..000000000
--- a/test/integration/rebase2/test.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "description": "rebasing by reordering two commits, causing a merge conflict", "speed": 10 }