diff options
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 28e3bbb4d..8ea4e79e4 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -13,11 +13,12 @@ import qualified Annex.Branch import qualified Git.Branch import Command.Sync (prepMerge, mergeLocal) -cmd :: [Command] -cmd = [command "merge" paramNothing seek SectionMaintenance - "automatically merge changes from remotes"] +cmd :: Command +cmd = command "merge" SectionMaintenance + "automatically merge changes from remotes" + paramNothing (withParams seek) -seek :: CommandSeek +seek :: CmdParams -> CommandSeek seek ps = do withNothing mergeBranch ps withNothing mergeSynced ps |