From bf3472bb1409d9879272471420d6724ee4ed096b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 25 Dec 2012 14:10:07 -0400
Subject: use sync command merge engine in assistant

To handle direct mode merging.
---
 Assistant/Threads/Merger.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Assistant')

diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs
index 105f0cc9f..c581f8087 100644
--- a/Assistant/Threads/Merger.hs
+++ b/Assistant/Threads/Merger.hs
@@ -14,8 +14,8 @@ import Utility.DirWatcher
 import Utility.Types.DirWatcher
 import qualified Annex.Branch
 import qualified Git
-import qualified Git.Merge
 import qualified Git.Branch
+import qualified Command.Sync
 
 thisThread :: ThreadName
 thisThread = "Merger"
@@ -80,8 +80,7 @@ onAdd file
 				[ "merging", show changedbranch
 				, "into", show current
 				]
-			void $ liftAnnex $ inRepo $
-				Git.Merge.mergeNonInteractive changedbranch
+			void $ liftAnnex  $ Command.Sync.mergeFrom changedbranch
 	mergecurrent _ = noop
 
 equivBranches :: Git.Ref -> Git.Ref -> Bool
-- 
cgit v1.2.3