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 6afa905..11f43f8 100644 --- a/test/conflicts.test +++ b/test/conflicts.test @@ -71,7 +71,7 @@ anymore, then the patch is fixed. $ mv one.txt one.x $ sed -e "s/4/4+/" one.x > one.txt - $ rm one.x + $ rm -f one.x $ quilt diff -z | grep -v "^\\(---\\|+++\\)" > Index: d/one.txt > =================================================================== |