diff options
Diffstat (limited to 'Command/ResolveMerge.hs')
-rw-r--r-- | Command/ResolveMerge.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index 0ecf180b8..148ce9e5c 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -15,10 +15,11 @@ import qualified Git.Branch import Annex.AutoMerge cmd :: Command -cmd = command "resolvemerge" paramNothing seek SectionPlumbing +cmd = command "resolvemerge" SectionPlumbing "resolve merge conflicts" + paramNothing (withParams seek) -seek :: CommandSeek +seek :: CmdParams -> CommandSeek seek = withNothing start start :: CommandStart |