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

resolvemerge: New plumbing command that runs the automatic merge conflict resolver.

Browse source
This commit is contained in:
Joey Hess 2014-07-11 16:45:18 -04:00
parent 003ebf58f5
commit cb66ca3a76
6 changed files with 60 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CmdLine/GitAnnex.hs
View file

@ -54,6 +54,7 @@ import qualified Command.Whereis
import qualified Command.List
import qualified Command.Log
import qualified Command.Merge
import qualified Command.ResolveMerge
import qualified Command.Info
import qualified Command.Status
import qualified Command.Migrate
@ -164,6 +165,7 @@ cmds = concat
, Command.List.def
, Command.Log.def
, Command.Merge.def
, Command.ResolveMerge.def
, Command.Info.def
, Command.Status.def
, Command.Migrate.def