From ff3c5d331ecaaa5a9f372deda8877a92331dde7f Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 25 Feb 2023 22:09:14 +1100 Subject: migrate merge conflict tests --- test/integration/mergeConflicts/test.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test/integration/mergeConflicts/test.json (limited to 'test/integration/mergeConflicts/test.json') diff --git a/test/integration/mergeConflicts/test.json b/test/integration/mergeConflicts/test.json deleted file mode 100644 index 1082379ed..000000000 --- a/test/integration/mergeConflicts/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we fix some merge conflicts, ensuring that in the flat tree structure the conflicts are bubbled to the top, and that after resolving the conflicts your cursor stays on the same line, able to select the next conflicted file. We also switch to tree mode and ensure that works too.", "speed": 10 } -- cgit v1.2.3