summaryrefslogtreecommitdiff
path: root/Command/Merge.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Command/Merge.hs')
-rw-r--r--Command/Merge.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs
index 33d4c8ffc..c1f7e899a 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -11,8 +11,8 @@ import Common.Annex
import Command
import qualified Annex.Branch
-command :: [Command]
-command = [Command "merge" paramNothing defaultChecks seek
+def :: [Command]
+def = [command "merge" paramNothing seek
"auto-merge remote changes into git-annex branch"]
seek :: [CommandSeek]