diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-21 17:39:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-21 17:52:39 -0400 |
| commit | 40ec8a9726586f24357a5ae2057a092a971c1046 (patch) | |
| tree | 3da8a6b99fe58f3405fcfb117050b5821fbc0041 /git-union-merge.hs | |
| parent | 7e7428f173ba1b72b4de69fd482f44161ee84420 (diff) | |
Branch module complete
Refactored some code that it needs into GitRepo.
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 |