diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-21 19:09:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-21 19:09:20 -0400 |
| commit | 5d20ac5800f6577fb40ebfa7c8d68df43757a3e1 (patch) | |
| tree | fc62a89be0fb294b8b05f9653f7e18cfc2a9939b /git-union-merge.hs | |
| parent | 40ec8a9726586f24357a5ae2057a092a971c1046 (diff) | |
export the commit function and generalize
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index e8ac0a0c5..f02db6be3 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -10,7 +10,7 @@ import System.FilePath import System.Directory import Control.Monad (when) -import GitUnionMerge +import qualified GitUnionMerge import qualified GitRepo as Git header :: String @@ -44,5 +44,5 @@ main = do g <- Git.configRead =<< Git.repoFromCwd Git.useIndex (tmpIndex g) setup g - unionMerge g aref bref newref False + GitUnionMerge.merge g aref bref newref False cleanup g |