diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 18:46:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 18:46:56 -0400 |
| commit | ad3770e0b203b32a07fa142d6d83c980b23310ee (patch) | |
| tree | d07022b5d9b7628701a737e3d3042680e2998770 /GitAnnex.hs | |
| parent | 80302d0b46c5d45df1cf290796e0e27d9264ece8 (diff) | |
add merge subcommand
Diffstat (limited to 'GitAnnex.hs')
| -rw-r--r-- | GitAnnex.hs | 2 |
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 |