summaryrefslogtreecommitdiff
path: root/GitUnionMerge.hs
diff options
context:
space:
mode:
Diffstat (limited to 'GitUnionMerge.hs')
-rw-r--r--GitUnionMerge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/GitUnionMerge.hs b/GitUnionMerge.hs
index 74579ebcc..84c7b44ea 100644
--- a/GitUnionMerge.hs
+++ b/GitUnionMerge.hs
@@ -18,7 +18,7 @@ import Data.List
import Data.Maybe
import Data.String.Utils
-import qualified GitRepo as Git
+import qualified Git
import Utility
{- Performs a union merge between two branches, staging it in the index.