From 40ec8a9726586f24357a5ae2057a092a971c1046 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 21 Jun 2011 17:39:45 -0400
Subject: Branch module complete

Refactored some code that it needs into GitRepo.
---
 git-union-merge.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/git-union-merge.hs b/git-union-merge.hs
index 12f49adc6..e8ac0a0c5 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -42,7 +42,7 @@ main :: IO ()
 main = do
 	[aref, bref, newref] <- parseArgs
 	g <- Git.configRead =<< Git.repoFromCwd
-	Git.withIndex (tmpIndex g) $ do
-		setup g
-		unionMerge g aref bref newref
-		cleanup g
+	Git.useIndex (tmpIndex g)
+	setup g
+	unionMerge g aref bref newref False
+	cleanup g
-- 
cgit v1.2.3