summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-15 03:12:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-15 03:12:05 -0400
commite78475737636a5d1e0d0a36b475c300cc7bb56cc (patch)
tree1d88de569e951b66ff5321eefaec49ad4b33bf89 /git-union-merge.hs
parent9bb797c0eae3c9d2f119a734762a6d5fa7321a80 (diff)
hlint tweaks
Did all sources except Remotes/* and Command/*
Diffstat (limited to 'git-union-merge.hs')
-rw-r--r--git-union-merge.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/git-union-merge.hs b/git-union-merge.hs
index 38df0df6a..e76337607 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -23,8 +23,7 @@ tmpIndex :: Git.Repo -> FilePath
tmpIndex g = Git.workTree g </> Git.gitDir g </> "index.git-union-merge"
setup :: Git.Repo -> IO ()
-setup g = do
- cleanup g -- idempotency
+setup g = cleanup g -- idempotency
cleanup :: Git.Repo -> IO ()
cleanup g = do
@@ -34,7 +33,7 @@ cleanup g = do
parseArgs :: IO [String]
parseArgs = do
args <- getArgs
- if (length args /= 3)
+ if length args /= 3
then usage
else return args