summaryrefslogtreecommitdiff
path: root/Git/UnionMerge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-14 15:56:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-14 15:56:11 -0400
commitef28b3fef7e236d8c27ce35308c0e37ece58d20c (patch)
tree346b40aaffcdb2ad5220741d9b9546821d07c4c9 /Git/UnionMerge.hs
parent02f1bd2bf47d3ff49a222e9428ec27708ef55f64 (diff)
split out Git/Command.hs
Diffstat (limited to 'Git/UnionMerge.hs')
-rw-r--r--Git/UnionMerge.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs
index a623e1ceb..a9a51007f 100644
--- a/Git/UnionMerge.hs
+++ b/Git/UnionMerge.hs
@@ -22,6 +22,7 @@ import Common
import Git
import Git.Sha
import Git.CatFile
+import Git.Command
type Streamer = (String -> IO ()) -> IO ()