From 896726cde425f6c74273b35cde30c1909551ff66 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 30 Jun 2011 13:32:47 -0400
Subject: rename GitUnionMerge to Git.UnionMerge

Also, moved commit function into Git proper, it's not union merge specific.
---
 git-union-merge.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'git-union-merge.hs')

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
-- 
cgit v1.2.3