diff options
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -552,6 +552,10 @@ t-gbp-example-prep () { t-gbp-unapplied-pq2qc t-commit 'some updates' 1.0-2 + + git merge -s ours \ + -m 'Pseudo-merge to make descendant of archive' \ + remotes/dgit/dgit/sid } t-commit () { |