diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-09-20 09:16:35 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-09-20 09:16:35 +0300 |
| commit | 923cf9d199c72db5c8e8c5042b343c861e3fb471 (patch) | |
| tree | 6ac59471cdb84ec248d55088ee1feeb632f371bc | |
| parent | bf07030abf32f9f70dc2e11c8ec540bb64e86491 (diff) | |
| download | gitlab-ce-merge-conflicts-editor.tar.gz | |
We now support resolving conflicts with ambiguous markersmerge-conflicts-editor
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index 759edf8ec80..1e8aeacea05 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -42,7 +42,6 @@ feature 'Merge request conflict resolution', js: true, feature: true do UNRESOLVABLE_CONFLICTS = { 'conflict-too-large' => 'when the conflicts contain a large file', 'conflict-binary-file' => 'when the conflicts contain a binary file', - 'conflict-contains-conflict-markers' => 'when the conflicts contain a file with ambiguous conflict markers', 'conflict-missing-side' => 'when the conflicts contain a file edited in one branch and deleted in another', 'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file', } |