Rebase merge3 branch into master

This commit is contained in:
Jonathan Wong
2019-12-20 03:43:11 -08:00
parent 7e56c2c768
commit aafeb75ef1
4 changed files with 318 additions and 0 deletions

View File

@@ -74,6 +74,7 @@ func NewConfigCommand(name string) *cobra.Command {
root.AddCommand(commands.CatCommand(name))
root.AddCommand(commands.FmtCommand(name))
root.AddCommand(commands.MergeCommand(name))
root.AddCommand(commands.Merge3Command(name))
root.AddCommand(commands.CountCommand(name))
root.AddCommand(commands.RunFnCommand(name))
root.AddCommand(commands.SubCommand(name))