From 0ca84a5da638e4a5e0da02555819182b3b9de715 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 14 Mar 2016 16:19:27 -0400
Subject: fix build of this

---
 git-union-merge.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-union-merge.hs')

diff --git a/git-union-merge.hs b/git-union-merge.hs
index 31c71ba72..693064045 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -44,5 +44,5 @@ main = do
 	_ <- Git.Index.override $ tmpIndex g
 	setup g
 	Git.UnionMerge.merge aref bref g
-	_ <- Git.Branch.commit "union merge" newref [aref, bref] g
+	_ <- Git.Branch.commit Git.Branch.ManualCommit False "union merge" newref [aref, bref] g
 	cleanup g
-- 
cgit v1.2.3