summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-30 13:16:57 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-30 13:21:39 -0400
commitf6063a094ec02caec314b42dc05f2f0595ae0ce4 (patch)
tree624717470d70b9119361803b4656dd1c79573354 /git-union-merge.hs
parent5fe02f280726442496303859e83f9ce1c48be0cb (diff)
renamed GitRepo to Git
It was always imported qualified as Git anyway
Diffstat (limited to 'git-union-merge.hs')
-rw-r--r--git-union-merge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs
index 57232be67..4939fb57d 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -11,7 +11,7 @@ import System.Directory
import Control.Monad (when)
import qualified GitUnionMerge
-import qualified GitRepo as Git
+import qualified Git
header :: String
header = "Usage: git-union-merge ref ref newref"