summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
Diffstat (limited to 'git-union-merge.hs')
-rw-r--r--git-union-merge.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs
index 3bf628c75..18c88b1a9 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -14,6 +14,7 @@ import qualified Git.CurrentRepo
import qualified Git.Branch
import qualified Git.Index
import qualified Git
+import Utility.FileSystemEncoding
header :: String
header = "Usage: git-union-merge ref ref newref"
@@ -39,6 +40,7 @@ parseArgs = do
main :: IO ()
main = do
+ useFileSystemEncoding
[aref, bref, newref] <- map Git.Ref <$> parseArgs
g <- Git.Config.read =<< Git.CurrentRepo.get
_ <- Git.Index.override (tmpIndex g) g