diff options
Diffstat (limited to 'merge_test.go')
| -rw-r--r-- | merge_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/merge_test.go b/merge_test.go index 74f08bc..1c0606e 100644 --- a/merge_test.go +++ b/merge_test.go @@ -15,9 +15,8 @@ func TestMergeWithSelf(t *testing.T) { mergeHead, err := repo.MergeHeadFromRef(master) checkFatal(t, err) - options, _ := DefaultMergeOptions() mergeHeads := make([]*MergeHead, 1) mergeHeads[0] = mergeHead - err = repo.Merge(mergeHeads, &options, nil) + err = repo.Merge(mergeHeads, nil, nil) checkFatal(t, err) } |