summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/conflicts.test2
-rw-r--r--test/example1.test2
-rw-r--r--test/new.test2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/conflicts.test b/test/conflicts.test
index f543678..6afa905 100644
--- a/test/conflicts.test
+++ b/test/conflicts.test
@@ -66,7 +66,7 @@ anymore, then the patch is fixed.
$ quilt push -qf
> Applying patch %{P}a.diff
- >~ 1 out of 2 hunks FAILED -- saving rejects to file `?one.txt.rej'?
+ >~ 1 out of 2 hunks FAILED -- saving rejects to (file )?`?one.txt.rej'?
> Applied patch %{P}a.diff (forced; needs refresh)
$ mv one.txt one.x
diff --git a/test/example1.test b/test/example1.test
index 6212f89..fabb362 100644
--- a/test/example1.test
+++ b/test/example1.test
@@ -101,7 +101,7 @@ Or ``quilt edit Oberon.txt''
> Applying patch %{P}flower.diff
>~ patching file `?Oberon.txt'?
> Hunk #1 FAILED at 2.
- >~ 1 out of 1 hunk FAILED -- saving rejects to file `?Oberon.txt.rej'?
+ >~ 1 out of 1 hunk FAILED -- saving rejects to (file )?`?Oberon.txt.rej'?
> Applied patch %{P}flower.diff (forced; needs refresh)
$ cat >> Oberon.txt
diff --git a/test/new.test b/test/new.test
index 31211dc..f71d4ed 100644
--- a/test/new.test
+++ b/test/new.test
@@ -28,7 +28,7 @@
> Applying patch %{P}p.diff
>~ patching file `?f'?
> Hunk #1 FAILED at 1.
- >~ 1 out of 1 hunk FAILED -- saving rejects to file `?f.rej'?
+ >~ 1 out of 1 hunk FAILED -- saving rejects to (file )?`?f.rej'?
>~ patching file `?g'?
> Applied patch %{P}p.diff (forced; needs refresh)