resolvemerge: New plumbing command that runs the automatic merge conflict resolver.
This commit is contained in:
parent
003ebf58f5
commit
cb66ca3a76
6 changed files with 60 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue