From ad3770e0b203b32a07fa142d6d83c980b23310ee Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 22 Jun 2011 18:46:45 -0400 Subject: add merge subcommand --- GitAnnex.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'GitAnnex.hs') 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 -- cgit v1.2.3