summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-25 14:10:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-25 14:10:07 -0400
commitbf3472bb1409d9879272471420d6724ee4ed096b (patch)
tree2a8e96b9c2130298897b6adcf2ac3dabd421ce71 /Assistant
parent399b31f5f3adfe2b9cd662c8b0e8127067568364 (diff)
use sync command merge engine in assistant
To handle direct mode merging.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/Merger.hs5
1 files changed, 2 insertions, 3 deletions
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