From cf6522c7fe093244a14334ced1c90c9791231a3e Mon Sep 17 00:00:00 2001 From: Suhaib Mujahid Date: Sat, 9 May 2020 23:32:17 -0400 Subject: refactor: Rename methods with Get prefix It is not Go idiomatic to put Get into the getter's name. https: //golang.org/doc/effective_go.html#Getters Co-Authored-By: lhchavez --- merge_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge_test.go') diff --git a/merge_test.go b/merge_test.go index 7cf034f..319bef3 100644 --- a/merge_test.go +++ b/merge_test.go @@ -109,7 +109,7 @@ func TestMergeTreesWithoutAncestor(t *testing.T) { if !index.HasConflicts() { t.Fatal("expected conflicts in the index") } - _, err = index.GetConflict("README") + _, err = index.Conflict("README") checkFatal(t, err) } -- cgit v1.2.3