diff options
Diffstat (limited to 'git-union-merge.hs')
| -rw-r--r-- | git-union-merge.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs index 12f49adc6..e8ac0a0c5 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -42,7 +42,7 @@ main :: IO () main = do [aref, bref, newref] <- parseArgs g <- Git.configRead =<< Git.repoFromCwd - Git.withIndex (tmpIndex g) $ do - setup g - unionMerge g aref bref newref - cleanup g + Git.useIndex (tmpIndex g) + setup g + unionMerge g aref bref newref False + cleanup g |