From eff3a8b4d04349a5462f54c31d6f39213cecef71 Mon Sep 17 00:00:00 2001
From: Jesse Ezell <jesse.ezell@neudesic.com>
Date: Wed, 26 Mar 2014 12:17:23 -0700
Subject: support nil merge options

---
 merge_test.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'merge_test.go')

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)
 }
-- 
cgit v1.2.3