summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/tests/quilt2
-rw-r--r--tests/worktrees/ruby-rails-3.2_test.tarbin215040 -> 215040 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/quilt b/tests/tests/quilt
index 37cb8d1..a6f78cd 100755
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -40,7 +40,7 @@ git merge branch
iteration
diff <<END - debian/patches/series
-change-something-in-the-upstream-yml
+ups-topic/ups-yml
spongiform-upstream-new-file-incl-change
zorkmid-options-=-42
END
diff --git a/tests/worktrees/ruby-rails-3.2_test.tar b/tests/worktrees/ruby-rails-3.2_test.tar
index fe01878..85365fe 100644
--- a/tests/worktrees/ruby-rails-3.2_test.tar
+++ b/tests/worktrees/ruby-rails-3.2_test.tar
Binary files differ