diff options
author | Joey Hess <joey@kitenet.net> | 2011-10-27 18:56:54 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-10-27 18:56:54 -0400 |
commit | b955238ec7464b12c793d543fc51308c8b213e08 (patch) | |
tree | a8953c64f6933fe233993b29f2a64cf45a850e48 /Command/Merge.hs | |
parent | c879eb873ec2fda1ec7d76c0de27d9ace57ba6e7 (diff) |
Fail if --from or --to is passed to commands that do not support them.
Diffstat (limited to 'Command/Merge.hs')
-rw-r--r-- | Command/Merge.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 2b7162946..33d4c8ffc 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -12,7 +12,7 @@ import Command import qualified Annex.Branch command :: [Command] -command = [Command "merge" paramNothing needsRepo seek +command = [Command "merge" paramNothing defaultChecks seek "auto-merge remote changes into git-annex branch"] seek :: [CommandSeek] |