diff options
| -rw-r--r-- | merge.go | 4 | ||||
| -rw-r--r-- | merge_test.go | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -146,7 +146,7 @@ func (r *Repository) Merge(theirHeads []*MergeHead, mergeOptions *MergeOptions, return nil } -func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options MergeOptions) (*Index, error) { +func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options *MergeOptions) (*Index, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() @@ -162,7 +162,7 @@ func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options MergeOpt return idx, nil } -func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, options MergeOptions) (*Index, error) { +func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, options *MergeOptions) (*Index, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() 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) } |