diff options
Diffstat (limited to 'Command/ResolveMerge.hs')
| -rw-r--r-- | Command/ResolveMerge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index 4425ffe46..145db37df 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -14,8 +14,8 @@ import Git.Sha import qualified Git.Branch import Annex.AutoMerge -def :: [Command] -def = [command "resolvemerge" paramNothing seek SectionPlumbing +cmd :: [Command] +cmd = [command "resolvemerge" paramNothing seek SectionPlumbing "resolve merge conflicts"] seek :: CommandSeek |