summaryrefslogtreecommitdiff
path: root/Command/Merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-24 18:28:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-24 18:28:21 -0400
commit9ad09558eb6c9f7ed651168a030e26bc5698c1b8 (patch)
tree25594af86475e8f358d2409e98e72992a633b524 /Command/Merge.hs
parent12cd5a673b59494db918df21272dd77091346d05 (diff)
add section metadata to all commands
Not yet used .. mindless train work.
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 0f4661497..382a251df 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -12,8 +12,8 @@ import Command
import qualified Annex.Branch
def :: [Command]
-def = [command "merge" paramNothing seek
- "auto-merge remote changes into git-annex branch"]
+def = [command "merge" paramNothing seek SectionMaintenance
+ "auto-merge remote changes into git-annex branch"]
seek :: [CommandSeek]
seek = [withNothing start]