diff options
| author | lhchavez <[email protected]> | 2020-05-09 20:39:51 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-05-09 20:39:51 -0700 |
| commit | 31f877e249e28c29cc4fcd512381a5a5b26e59d9 (patch) | |
| tree | eba9030b1449cddf6274b748fbfcf010680d35cd /merge_test.go | |
| parent | 8b51d0db8e40e97283b771a5a51b13bea4651f81 (diff) | |
| parent | cf6522c7fe093244a14334ced1c90c9791231a3e (diff) | |
Merge pull request #582 from suhaibmujahid/method-rename
It is not Go idiomatic to put Get into the getter's name
Diffstat (limited to 'merge_test.go')
| -rw-r--r-- | merge_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) } |