diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/conflicts.test | 2 | ||||
| -rw-r--r-- | test/one.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/conflicts.test b/test/conflicts.test index 1b16f36..b8c6d11 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -60,7 +60,7 @@ anymore, then the patch is fixed. $ sed -e "s/^\\([123567]\\)\$/\\1-/" one.orig > one.txt $ quilt push -q > Applying a - > 1 out of 2 hunks FAILED -- saving rejects to file one.txt.rej + > 1 out of 2 hunks FAILED -- rejects in file one.txt > Patch a does not apply (enforce with -f) $ quilt push -qf diff --git a/test/one.test b/test/one.test index b5bbeb1..d1298c5 100644 --- a/test/one.test +++ b/test/one.test @@ -76,7 +76,7 @@ of the installed quilt with `make check'. $ quilt pop -R > Removing patch2 - > patching file dir/file3 + > Removing dir/file3 > > Now at patch patch1 @@ -138,7 +138,7 @@ of the installed quilt with `make check'. $ echo "Another line here, too." >> dir/file3 $ quilt pop -R > Removing subdir/patch3 - > patching file file4 + > Restoring file4 > > Now at patch patch2 |