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/Merge.hs | |
| parent | 9f5b8638a990f8d163afaf62e15331515fdcb21f (diff) | |
doh't use "def" for command definitions, it conflicts with Data.Default.def
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 51a8b9c52..eeb151c27 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -13,8 +13,8 @@ import qualified Annex.Branch import qualified Git.Branch import Command.Sync (prepMerge, mergeLocal) -def :: [Command] -def = [command "merge" paramNothing seek SectionMaintenance +cmd :: [Command] +cmd = [command "merge" paramNothing seek SectionMaintenance "automatically merge changes from remotes"] seek :: CommandSeek |