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 693064045..3bf628c75 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -41,7 +41,7 @@ main :: IO () main = do [aref, bref, newref] <- map Git.Ref <$> parseArgs g <- Git.Config.read =<< Git.CurrentRepo.get - _ <- Git.Index.override $ tmpIndex g + _ <- Git.Index.override (tmpIndex g) g setup g Git.UnionMerge.merge aref bref g _ <- Git.Branch.commit Git.Branch.ManualCommit False "union merge" newref [aref, bref] g |