diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-14 15:35:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-14 15:35:15 -0400 |
| commit | 513b3a639796b06828570b6da6b049095abd5b83 (patch) | |
| tree | adc204e55854d1d5d4f75689ea17fa9624142872 /Annex/AutoMerge.hs | |
| parent | cd4304b64943ba55ffc8beac47796affc5405fd8 (diff) | |
| parent | 1029cba6ac006b34053f3f96cbee9ecafe8cc1ae (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
debian/changelog
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 |