diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
| commit | 070b1a03392ab3962eb43f60f32fde5c1b9b70d2 (patch) | |
| tree | b6097608e2e12c026ca05164fc81148ede79cc23 /Command/Sync.hs | |
| parent | 2caa1330b3abb4bb2ac60eb8b144046d03a1287b (diff) | |
fix auto merge conflict resolution when doing out of tree merge for adjusted branch
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |