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 e76337607..4e1a932b4 100644 --- a/git-union-merge.hs +++ b/git-union-merge.hs @@ -20,7 +20,7 @@ usage :: IO a usage = error $ "bad parameters\n\n" ++ header tmpIndex :: Git.Repo -> FilePath -tmpIndex g = Git.workTree g </> Git.gitDir g </> "index.git-union-merge" +tmpIndex g = Git.gitDir g </> "index.git-union-merge" setup :: Git.Repo -> IO () setup g = cleanup g -- idempotency |