diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/tests/gdr-diverge-nmu | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu index 94fd44a..6d14bba 100755 --- a/tests/tests/gdr-diverge-nmu +++ b/tests/tests/gdr-diverge-nmu @@ -51,4 +51,16 @@ git merge --squash -m 'Incorporate NMU' dgit/dgit/sid git rm -rf debian/patches git commit -m 'Incorporate NMU' +git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid + +: 'right, how are we' + +t-git-next-date + +t-git-debrebase +t-gdr-good laundered + +t-git-debrebase stitch +t-gdr-good stitched + t-ok |