diff options
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 { |