diff options
Diffstat (limited to 'test/conflicts.test')
| -rw-r--r-- | test/conflicts.test | 2 |
1 files changed, 1 insertions, 1 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 |