From a0e7604f61f19f829f76966fb3f97cab09307ab1 Mon Sep 17 00:00:00 2001 From: Ryooooooga Date: Sun, 22 Aug 2021 01:03:05 +0900 Subject: Support `git config merge.conflictStyle diff3` --- pkg/gui/mergeconflicts/find_conflicts_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkg/gui/mergeconflicts/find_conflicts_test.go') 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 { -- cgit v1.2.3