mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

a few hlints

Browse source
This commit is contained in:
Joey Hess 2015-04-11 00:10:34 -04:00
parent 32aa42de7d
commit 2b79e6fe08
14 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/AutoMerge.hs
View file

@ -37,7 +37,7 @@ import qualified Data.Set as S
- Callers should use Git.Branch.changed first, to make sure that
- there are changed from the current branch to the branch being merged in.
-}
autoMergeFrom :: Git.Ref -> (Maybe Git.Ref) -> Git.Branch.CommitMode -> Annex Bool
autoMergeFrom :: Git.Ref -> Maybe Git.Ref -> Git.Branch.CommitMode -> Annex Bool
autoMergeFrom branch currbranch commitmode = do
showOutput
case currbranch of