summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:59:20 -0400
committerJoey Hess2014-08-19 17:59:20 -0400
commit95f89280dda74b6c7df166f8c584cf337f5b3f96 (patch)
treef0d91a69cc8c79e90d639d68b8cb9608cecb62d1
parentc9295410738d532bbf6ebc844c78d45d2d7c691f (diff)
parentd6320b8130fb65b793ee09b031b47b23dc27beef (diff)
Merge branch 'joeyconfig'
-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