From 2a727e8c5f8d003af7102ea7de22e45a5faec421 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 11 Jul 2014 16:45:18 -0400
Subject: resolvemerge: New plumbing command that runs the automatic merge
 conflict resolver.

---
 CmdLine/GitAnnex.hs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CmdLine/GitAnnex.hs')

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
-- 
cgit v1.2.3