diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-13 15:05:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-13 15:06:49 -0400 |
| commit | 13fff71f2019ae098c3f8532ac2734cb1ab11498 (patch) | |
| tree | f37714c4089df4afac9bf9724c80757e5fd29e6f /git-union-merge.hs | |
| parent | 46588674b081cd4ea5820680d8fc15c81ed175ad (diff) | |
split out three modules from Git
Constructors and configuration make sense in separate modules.
A separate Git.Types is needed to avoid cycles.
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 4 |
1 files changed, 3 insertions, 1 deletions
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 |