diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-23 13:16:22 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-23 13:16:22 +0000 |
| commit | f7a772c2f872ed1b5b4a69c9c55f1281cbee625a (patch) | |
| tree | a579e0522c2eb5e7b6542480d426862da8720b43 /test/conflicts.test | |
| parent | ef8f0df0f7785c44a227fc95ebbb2ac24ecf283d (diff) | |
| download | quilt-f7a772c2f872ed1b5b4a69c9c55f1281cbee625a.tar.gz | |
- configure.ac: Require GNU patch 2.4+.
- quilt/import.in: Don't use diff -U-1.
- Test suite: Recognize output of old versions of patch (from
jayvdb@gmail.com).
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 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 |