summaryrefslogtreecommitdiff
path: root/Assistant/Sync.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Assistant/Sync.hs')
-rw-r--r--Assistant/Sync.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs
index 8f30aa4f7..e6a5bc5d5 100644
--- a/Assistant/Sync.hs
+++ b/Assistant/Sync.hs
@@ -211,7 +211,8 @@ manualPull currentbranch remotes = do
else return Nothing
haddiverged <- liftAnnex Annex.Branch.forceUpdate
forM_ normalremotes $ \r ->
- liftAnnex $ Command.Sync.mergeRemote r currentbranch Command.Sync.mergeConfig
+ liftAnnex $ Command.Sync.mergeRemote r
+ currentbranch Command.Sync.mergeConfig def
return (catMaybes failed, haddiverged)
where
wantpull gc = remoteAnnexPull gc