diff options
| author | Cristian Betivu <cbe@languagewire.com> | 2021-05-30 12:42:06 +0200 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-06-05 13:53:25 +1000 |
| commit | fd38ad809606bda7dfb820a0c2a56e2aaa0f87bd (patch) | |
| tree | fc55f142c8b197605263b27743049f4a035ba652 | |
| parent | d502c43ae89bf642e18db3ba5970b419a6b6fba6 (diff) | |
More generic merge conflict detection
| -rw-r--r-- | pkg/gui/mergeconflicts/state_test.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkg/gui/mergeconflicts/state_test.go b/pkg/gui/mergeconflicts/state_test.go index df2e077b4..442265fb6 100644 --- a/pkg/gui/mergeconflicts/state_test.go +++ b/pkg/gui/mergeconflicts/state_test.go @@ -51,6 +51,13 @@ foo ++======= bar ++>>>>>>> branch + +<<<<<<< Updated upstream: foo/bar/baz.go +foo +bar +======= +baz +>>>>>>> branch `, expected: []*mergeConflict{ { @@ -78,6 +85,11 @@ bar middle: 27, end: 29, }, + { + start: 31, + middle: 34, + end: 36, + }, }, }, } |