mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add merge subcommand

Browse source
This commit is contained in:
Joey Hess 2011-06-22 18:46:45 -04:00
parent 80302d0b46
commit ad3770e0b2
5 changed files with 42 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GitAnnex.hs
View file

@ -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