diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2005-09-23 12:47:15 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2005-09-23 12:47:15 +0000 |
commit | 3f715ddbd69b01dd5df3ae2d5ecfa3e0a5f2f2c1 (patch) | |
tree | 538ce554a9ea4be4c06bf5bd0425e61db5d1b93c /test/merge.test | |
parent | 3ec760ba69941fba7c3ca8ae42cdf1fde587fa0f (diff) | |
download | quilt-3f715ddbd69b01dd5df3ae2d5ecfa3e0a5f2f2c1.tar.gz |
- Fix the test suite so that it doesn't fail if any higher-level
directory contains a patches/ sub-directory (iow, if quilt
itself is patched with quilt).
Diffstat (limited to 'test/merge.test')
-rw-r--r-- | test/merge.test | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/merge.test b/test/merge.test index aaa9da8..5d2deb5 100644 --- a/test/merge.test +++ b/test/merge.test @@ -1,6 +1,6 @@ Test the patch merging functionality of `quilt diff'. - $ mkdir d + $ mkdir -p d/patches $ cd d $ cat > abc.txt @@ -8,7 +8,6 @@ Test the patch merging functionality of `quilt diff'. < b < c - $ mkdir patches $ cat > patches/series < a.diff < b.diff |