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

2014-07-11 16:45:18 -04:00 · 2014-07-11 16:45:18 -04:00 · cb66ca3a76
commit cb66ca3a76
parent 003ebf58f5
6 changed files with 60 additions and 3 deletions
--- a/Annex/AutoMerge.hs
+++ b/Annex/AutoMerge.hs
@ -5,7 +5,10 @@
 - Licensed under the GNU GPL version 3 or higher.
 -}

-module Annex.AutoMerge (autoMergeFrom) where
+module Annex.AutoMerge
+	( autoMergeFrom
+	, resolveMerge
+	) where

 import Common.Annex
 import qualified Annex.Queue