From 3acdba3995941907028905a7c18362309af924b5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 Oct 2011 13:17:54 -0400
Subject: faster union merge of multiple branches into index

only write index once
---
 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 34f22d06f..0d1d0819d 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -41,6 +41,6 @@ main = do
 	g <- Git.configRead =<< Git.repoFromCwd
 	_ <- Git.useIndex (tmpIndex g)
 	setup g
-	Git.UnionMerge.merge g [aref, bref]
+	Git.UnionMerge.merge g aref bref
 	Git.commit g "union merge" newref [aref, bref]
 	cleanup g
-- 
cgit v1.2.3