diff options
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index e439c4665..f44136bfc 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -40,7 +40,7 @@ parseArgs = do main :: IO () main = do [aref, bref, newref] <- map Git.Ref <$> parseArgs - g <- Git.Config.read =<< Git.Construct.fromCwd + g <- Git.Config.read =<< Git.Construct.fromCurrent _ <- Git.Index.override $ tmpIndex g setup g Git.UnionMerge.merge aref bref g |