diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-30 13:32:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-30 13:32:47 -0400 |
| commit | 896726cde425f6c74273b35cde30c1909551ff66 (patch) | |
| tree | 39f5c3f7636b53af79625866d845e50897d8fd1c /git-union-merge.hs | |
| parent | f0497312a77d59f24c8273245ac324b02bb1eb13 (diff) | |
rename GitUnionMerge to Git.UnionMerge
Also, moved commit function into Git proper, it's not union merge specific.
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index 4939fb57d..38df0df6a 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 qualified GitUnionMerge +import qualified Git.UnionMerge import qualified Git header :: String @@ -44,6 +44,6 @@ main = do g <- Git.configRead =<< Git.repoFromCwd _ <- Git.useIndex (tmpIndex g) setup g - GitUnionMerge.merge g [aref, bref] - GitUnionMerge.commit g "union merge" newref [aref, bref] + Git.UnionMerge.merge g [aref, bref] + Git.commit g "union merge" newref [aref, bref] cleanup g |