From f29236e0d983709fb544214fe4d819657cadc915 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 4 Mar 2014 16:26:15 -0400 Subject: factor out Annex.AutoMerge from Command.Sync --- Assistant/Threads/Merger.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Assistant/Threads/Merger.hs') diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 8c406990a..74f67aab7 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -17,7 +17,7 @@ import Utility.DirWatcher.Types import qualified Annex.Branch import qualified Git import qualified Git.Branch -import qualified Command.Sync +import Annex.AutoMerge import Annex.TaggedPush import Remote (remoteFromUUID) @@ -83,7 +83,7 @@ onChange file [ "merging", Git.fromRef changedbranch , "into", Git.fromRef current ] - void $ liftAnnex $ Command.Sync.mergeFrom changedbranch + void $ liftAnnex $ autoMergeFrom changedbranch mergecurrent _ = noop handleDesynced = case fromTaggedBranch changedbranch of -- cgit v1.2.3