summaryrefslogtreecommitdiff
path: root/Command/Merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-10-27 16:31:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-10-27 16:31:35 -0400
commit5b74b130a39d8c45e7d24520d838d6c1635582c7 (patch)
tree3d2816f028e7135a168d64c6342e1a2588260417 /Command/Merge.hs
parent66194684acaf8dc5c72e5a163465b42050cf9212 (diff)
refactored and generalized pre-command sanity checking
Diffstat (limited to 'Command/Merge.hs')
-rw-r--r--Command/Merge.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs
index eef2f3857..2b7162946 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -12,7 +12,7 @@ import Command
import qualified Annex.Branch
command :: [Command]
-command = [repoCommand "merge" paramNothing seek
+command = [Command "merge" paramNothing needsRepo seek
"auto-merge remote changes into git-annex branch"]
seek :: [CommandSeek]