summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:57:52 -0400
committerJoey Hess2014-08-19 17:57:52 -0400
commitc9295410738d532bbf6ebc844c78d45d2d7c691f (patch)
treef56f3721e21bd370ea70403aa2857561c3862612
parentc0cc5d214bb9fc609c9f90cc1a024baef43853fa (diff)
parent5d92ed6ea773ae62344d114e8a1992fd61bd9445 (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 f551572f..08d5176e 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, "--quiet", "-m", "merging upstream version"]
+ git ["merge", newref, "-s", "theirs", "--quiet", "-m", "merging upstream version"]
fetchUpstreamBranch propellordir tmprepo
cleantmprepo