diff options
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) } |