diff options
| author | Jesse Ezell <[email protected]> | 2014-03-26 12:17:23 -0700 |
|---|---|---|
| committer | Jesse Ezell <[email protected]> | 2014-03-26 12:17:23 -0700 |
| commit | eff3a8b4d04349a5462f54c31d6f39213cecef71 (patch) | |
| tree | 81c2a3744ac3426d7480f0bc8ccb30ad41a3f614 /merge_test.go | |
| parent | 50a3c4aa0935adb798bc4ecf6612710908d227cf (diff) | |
support nil merge 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) } |