diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 17:59:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 17:59:20 -0400 |
| commit | 95f89280dda74b6c7df166f8c584cf337f5b3f96 (patch) | |
| tree | f0d91a69cc8c79e90d639d68b8cb9608cecb62d1 /src | |
| parent | c9295410738d532bbf6ebc844c78d45d2d7c691f (diff) | |
| parent | d6320b8130fb65b793ee09b031b47b23dc27beef (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapper.hs | 2 |
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 |