aboutsummaryrefslogtreecommitdiff
path: root/tests/diff.test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/diff.test')
-rw-r--r--tests/diff.test5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/diff.test b/tests/diff.test
index 98477587..f78eaa66 100644
--- a/tests/diff.test
+++ b/tests/diff.test
@@ -33,3 +33,8 @@ echo foo > tree1/file
echo food > tree2/file
testing "-r" "diff -r -L tree1/file -L tree2/file tree1 tree2 |tee out" "$expected" "" ""
+
+echo -e "hello\r\nworld\r\n"> a
+echo -e "hello\nworld\n"> b
+testing "--strip-trailing-cr off" "diff -q a b" "Files a and b differ\n" "" ""
+testing "--strip-trailing-cr on" "diff -u --strip-trailing-cr a b" "" "" ""