diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-14 14:20:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-14 14:20:10 -0400 |
| commit | 5a3f41a50d1fd94a18fcced49722f3087e36aec6 (patch) | |
| tree | a053b3ce52c8d6693ef3f70b188a818cfc89dc85 /Command/ResolveMerge.hs | |
| parent | 9f5b8638a990f8d163afaf62e15331515fdcb21f (diff) | |
doh't use "def" for command definitions, it conflicts with Data.Default.def
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 |