diff options
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 |