From 9db8ec210f8491de78cd7e83b94c50ead8049e72 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 13 Dec 2011 15:22:43 -0400 Subject: split out two more Git modules --- git-union-merge.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'git-union-merge.hs') diff --git a/git-union-merge.hs b/git-union-merge.hs index eeb694401..f67414bdd 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -11,6 +11,7 @@ import Common import qualified Git.UnionMerge import qualified Git.Config import qualified Git.Construct +import qualified Git.Branch import qualified Git header :: String @@ -44,5 +45,5 @@ main = do _ <- Git.useIndex (tmpIndex g) setup g Git.UnionMerge.merge aref bref g - _ <- Git.commit "union merge" newref [aref, bref] g + _ <- Git.Branch.commit "union merge" newref [aref, bref] g cleanup g -- cgit v1.2.3