diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 21:44:38 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 21:44:38 +0000 |
| commit | 1455b44c6a3265cbfda24c695eb2dd231faa854b (patch) | |
| tree | 75901808a622467a5d29c85b281622718d1ba499 /test/conflicts.test | |
| parent | e9d3b15754c61017423b3abc8cf6baab78d04a7e (diff) | |
| download | quilt-1455b44c6a3265cbfda24c695eb2dd231faa854b.tar.gz | |
- GNU patch 2.5 messages differ slightly from the messages of more
recent versions. Recognize the old version's output when fixing
patch's output in the push command, and also accept the old
version's output in the test suite.
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 bc8b600..f543678 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 |