summaryrefslogtreecommitdiff
path: root/GitAnnex.hs
diff options
context:
space:
mode:
Diffstat (limited to 'GitAnnex.hs')
-rw-r--r--GitAnnex.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs
index 103ee262f..727e0c396 100644
--- a/GitAnnex.hs
+++ b/GitAnnex.hs
@@ -39,6 +39,7 @@ import qualified Command.Lock
import qualified Command.PreCommit
import qualified Command.Find
import qualified Command.Whereis
+import qualified Command.Merge
import qualified Command.Status
import qualified Command.Migrate
import qualified Command.Uninit
@@ -76,6 +77,7 @@ cmds = concat
, Command.DropUnused.command
, Command.Find.command
, Command.Whereis.command
+ , Command.Merge.command
, Command.Status.command
, Command.Migrate.command
, Command.Map.command