diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 18:32:56 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-26 01:20:43 +0100 |
| commit | 30a7ead54a9ca133f1f0d7ac7c3836d9e6fb86a1 (patch) | |
| tree | 80ed2094c35b82e1e1319900473c2bdfd7a16966 /tests/tests | |
| parent | 8273a14340edc80b2a71815c8a0e6149f9b8392a (diff) | |
git-debrebase: gdr-merge-conflicts: Call git merge --no-edit
The default seems different in my sid chroot.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 1f3f09e..5a3f243 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -6,6 +6,7 @@ autoimport= t-dependencies NO-DGIT GDR quilt t-tstunt-parsechangelog +t-tstunt debchange t-setup-import gdr-convert-gbp-noarchive t_gdr_xopts+=' --experimental-merge-resolution' @@ -58,7 +59,7 @@ git branch master-before-merge : ----- make the merge ----- -git merge -s ours other +git merge --no-edit -s ours other # we have to do a little dance to make this not a pseudomerge t-git-next-date |