diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-11 16:45:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-11 16:45:18 -0400 |
| commit | 2a727e8c5f8d003af7102ea7de22e45a5faec421 (patch) | |
| tree | 661d008aeb7f13c873c9afb7dcfa360aed60a528 /CmdLine | |
| parent | 64b74f4c616bd1aa42e7833b449586b64dac1ba5 (diff) | |
resolvemerge: New plumbing command that runs the automatic merge conflict resolver.
Diffstat (limited to 'CmdLine')
| -rw-r--r-- | CmdLine/GitAnnex.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index e4dd29b67..4c9377df9 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -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 |