summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:59:15 -0400
committerJoey Hess2014-08-19 17:59:15 -0400
commitd6320b8130fb65b793ee09b031b47b23dc27beef (patch)
treed7e79f2059941b0152cea7e10c4422a4af791710
parent5d92ed6ea773ae62344d114e8a1992fd61bd9445 (diff)
-X
-rw-r--r--src/wrapper.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 08d5176e..75830e72 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -125,7 +125,7 @@ setupupstreammaster newref propellordir = do
changeWorkingDirectory tmprepo
git ["fetch", distrepo, "--quiet"]
git ["reset", "--hard", oldref, "--quiet"]
- git ["merge", newref, "-s", "theirs", "--quiet", "-m", "merging upstream version"]
+ git ["merge", newref, "-s", "recursive", "-Xtheirs", "--quiet", "-m", "merging upstream version"]
fetchUpstreamBranch propellordir tmprepo
cleantmprepo