diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-08 15:08:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-08 15:08:02 -0400 |
| commit | e7e61fb6cbe5455ded9bb550a64121223c099fc2 (patch) | |
| tree | 003a99697256ea516ad40f9fbdb854996b58c0cd /Command/ResolveMerge.hs | |
| parent | 8879c96d157f06bbd2372064251676b7927ce38e (diff) | |
convert all commands to work with optparse-applicative
Still no options though.
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 |