diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-25 22:09:14 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-02-26 11:22:24 +1100 |
| commit | ff3c5d331ecaaa5a9f372deda8877a92331dde7f (patch) | |
| tree | 6aa51c4c070ddf01d1b37f34c1e0cb6928f10ccf /test/integration/mergeConflicts/test.json | |
| parent | 33f9f81c8c83f33ef75ef5cd9dee7b842af07e64 (diff) | |
migrate merge conflict tests
Diffstat (limited to 'test/integration/mergeConflicts/test.json')
| -rw-r--r-- | test/integration/mergeConflicts/test.json | 1 |
1 files changed, 0 insertions, 1 deletions
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 } |