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.

---
 Annex/AutoMerge.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Annex/AutoMerge.hs')

diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs
index d587e03d1..6695c6d38 100644
--- 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
-- 
cgit v1.2.3