diff options
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 |