summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-06 17:32:04 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-06 17:32:04 -0400
commit070b1a03392ab3962eb43f60f32fde5c1b9b70d2 (patch)
treeb6097608e2e12c026ca05164fc81148ede79cc23 /Command
parent2caa1330b3abb4bb2ac60eb8b144046d03a1287b (diff)
fix auto merge conflict resolution when doing out of tree merge for adjusted branch
Diffstat (limited to 'Command')
-rw-r--r--Command/ResolveMerge.hs2
-rw-r--r--Command/Sync.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs
index 12fe8cfd3..8742a1104 100644
--- a/Command/ResolveMerge.hs
+++ b/Command/ResolveMerge.hs
@@ -29,7 +29,7 @@ start = do
let merge_head = d </> "MERGE_HEAD"
them <- fromMaybe (error nomergehead) . extractSha
<$> liftIO (readFile merge_head)
- ifM (resolveMerge (Just us) them)
+ ifM (resolveMerge (Just us) them False)
( do
void $ commitResolvedMerge Git.Branch.ManualCommit
next $ next $ return True
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 69f39bb8a..9ef26f19e 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -170,7 +170,7 @@ merge :: CurrBranch -> Git.Branch.CommitMode -> Git.Branch -> Annex Bool
merge (Just b, Just adj) commitmode tomerge =
updateAdjustedBranch tomerge (b, adj) commitmode
merge (b, _) commitmode tomerge =
- autoMergeFrom tomerge b commitmode
+ autoMergeFrom tomerge b False commitmode
syncBranch :: Git.Branch -> Git.Branch
syncBranch = Git.Ref.under "refs/heads/synced" . fromDirectBranch . fromAdjustedBranch