diff options
Diffstat (limited to '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 |