diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-13 15:22:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-13 15:24:23 -0400 |
| commit | 9db8ec210f8491de78cd7e83b94c50ead8049e72 (patch) | |
| tree | 539d2a49f1599fdd4855570d046f710809062a8e /git-union-merge.hs | |
| parent | 25b2cc4148e4cc8f7435cdbcf4b124cc317c1305 (diff) | |
split out two more Git modules
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 3 |
1 files changed, 2 insertions, 1 deletions
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 |