diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-04 16:26:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-04 16:26:15 -0400 |
| commit | f29236e0d983709fb544214fe4d819657cadc915 (patch) | |
| tree | fe610ca5d26a6736a921dda3aa672e41afe3deec /Assistant/Threads | |
| parent | f470bb435c1d49af5931088743e8efed05c1f095 (diff) | |
factor out Annex.AutoMerge from Command.Sync
Diffstat (limited to 'Assistant/Threads')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |