diff options
| author | Ryooooooga <eial5q265e5@gmail.com> | 2021-08-22 01:03:05 +0900 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-08-25 22:23:55 +1000 |
| commit | a0e7604f61f19f829f76966fb3f97cab09307ab1 (patch) | |
| tree | 36bde2f20620974664d4acee44a900bcf032b129 /pkg/gui/mergeconflicts/find_conflicts_test.go | |
| parent | aedeba4fe3bb38a7467dccc2cbe461d8d014dca0 (diff) | |
Support `git config merge.conflictStyle diff3`
Diffstat (limited to 'pkg/gui/mergeconflicts/find_conflicts_test.go')
| -rw-r--r-- | pkg/gui/mergeconflicts/find_conflicts_test.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/gui/mergeconflicts/find_conflicts_test.go b/pkg/gui/mergeconflicts/find_conflicts_test.go index c0a8e3e5b..bcc70ce73 100644 --- a/pkg/gui/mergeconflicts/find_conflicts_test.go +++ b/pkg/gui/mergeconflicts/find_conflicts_test.go @@ -43,12 +43,16 @@ func TestDetermineLineType(t *testing.T) { }, { line: "=======", - expected: MIDDLE, + expected: TARGET, }, { line: ">>>>>>> blah", expected: END, }, + { + line: "||||||| adf33b9", + expected: ANCESTOR, + }, } for _, s := range scenarios { |