diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-11 00:10:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-11 00:10:34 -0400 |
| commit | e80353490db56e21d266a384141d39f50797e8e3 (patch) | |
| tree | b6d7a46763e1d83f11fd57eaad36800d666f7a8f /Annex/AutoMerge.hs | |
| parent | 9becab4331b57a05369a3dcf225c57fd24f39e41 (diff) | |
a few hlints
Diffstat (limited to 'Annex/AutoMerge.hs')
| -rw-r--r-- | Annex/AutoMerge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index f0f183dfb..5ffa7b073 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -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 |