diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-08 12:33:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-08 13:36:25 -0400 |
| commit | e73914b7950ce9d26a3882472c7ab27260ff87f9 (patch) | |
| tree | 33d4a11106a005eadfe317505ea2786e83cf5bc8 /Command/ResolveMerge.hs | |
| parent | 8ce422d8ab390e105d70f049c30d81c14d3b64b4 (diff) | |
started converting to use optparse-applicative
This is a work in progress. It compiles and is able to do basic command
dispatch, including git autocorrection, while using optparse-applicative
for the core commandline parsing.
* Many commands are temporarily disabled before conversion.
* Options are not wired in yet.
* cmdnorepo actions don't work yet.
Also, removed the [Command] list, which was only used in one place.
Diffstat (limited to 'Command/ResolveMerge.hs')
| -rw-r--r-- | Command/ResolveMerge.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index ce199e504..0ecf180b8 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -14,9 +14,9 @@ import Git.Sha import qualified Git.Branch import Annex.AutoMerge -cmd :: [Command] -cmd = [command "resolvemerge" paramNothing seek SectionPlumbing - "resolve merge conflicts"] +cmd :: Command +cmd = command "resolvemerge" paramNothing seek SectionPlumbing + "resolve merge conflicts" seek :: CommandSeek seek = withNothing start |