diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-09-20 09:16:35 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | 6af52d7d23cf9dbfcd58a2d3031ed19887f7a558 (patch) | |
| tree | 8b3fa8a56ca59861365c0e7eecf59f253098b8b5 | |
| parent | 4743d19463e7aef965665e43238af73820d18d7f (diff) | |
| download | gitlab-ce-6af52d7d23cf9dbfcd58a2d3031ed19887f7a558.tar.gz | |
We now support resolving conflicts with ambiguous markers
| -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', } |