diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-08-19 12:59:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-08-19 12:59:21 -0400 |
| commit | e97fede8cd86d0eb804ced6d2877f617ba15b1a6 (patch) | |
| tree | de28895e0a282bcc460c9da8636996272e0df7ec /git-union-merge.hs | |
| parent | 7cedd28ab00d93b4a8d70810511a7c28cae65fd1 (diff) | |
make gitDir absolute
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 |