From 13fff71f2019ae098c3f8532ac2734cb1ab11498 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 13 Dec 2011 15:05:07 -0400
Subject: split out three modules from Git

Constructors and configuration make sense in separate modules.
A separate Git.Types is needed to avoid cycles.
---
 git-union-merge.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/git-union-merge.hs b/git-union-merge.hs
index edd9330c8..eeb694401 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -9,6 +9,8 @@ import System.Environment
 
 import Common
 import qualified Git.UnionMerge
+import qualified Git.Config
+import qualified Git.Construct
 import qualified Git
 
 header :: String
@@ -38,7 +40,7 @@ parseArgs = do
 main :: IO ()
 main = do
 	[aref, bref, newref] <- map Git.Ref <$> parseArgs
-	g <- Git.configRead =<< Git.repoFromCwd
+	g <- Git.Config.read =<< Git.Construct.fromCwd
 	_ <- Git.useIndex (tmpIndex g)
 	setup g
 	Git.UnionMerge.merge aref bref g
-- 
cgit v1.2.3