summaryrefslogtreecommitdiff
path: root/tests/test-diff-ignore-whitespace.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-diff-ignore-whitespace.t')
-rw-r--r--tests/test-diff-ignore-whitespace.t56
1 files changed, 0 insertions, 56 deletions
diff --git a/tests/test-diff-ignore-whitespace.t b/tests/test-diff-ignore-whitespace.t
index 35ca98d..ac5764a 100644
--- a/tests/test-diff-ignore-whitespace.t
+++ b/tests/test-diff-ignore-whitespace.t
@@ -442,59 +442,3 @@ Only new line noticed:
New line not noticed when space change ignored:
$ hg ndiff --ignore-blank-lines --ignore-all-space
-
-Do not ignore all newlines, only blank lines
-
- $ printf 'hello \nworld\ngoodbye world\n' > foo
- $ hg ndiff --ignore-blank-lines
- diff -r 540c40a65b78 foo
- --- a/foo
- +++ b/foo
- @@ -1,2 +1,3 @@
- -hello world
- +hello
- +world
- goodbye world
-
-Test hunk offsets adjustments with --ignore-blank-lines
-
- $ hg revert -aC
- reverting foo
- $ printf '\nb\nx\nd\n' > a
- $ printf 'b\ny\nd\n' > b
- $ hg add a b
- $ hg ci -m add
- $ hg cat -r . a > b
- $ hg cat -r . b > a
- $ hg diff -B --nodates a > ../diffa
- $ cat ../diffa
- diff -r 0e66aa54f318 a
- --- a/a
- +++ b/a
- @@ -1,4 +1,4 @@
-
- b
- -x
- +y
- d
- $ hg diff -B --nodates b > ../diffb
- $ cat ../diffb
- diff -r 0e66aa54f318 b
- --- a/b
- +++ b/b
- @@ -1,3 +1,3 @@
- b
- -y
- +x
- d
- $ hg revert -aC
- reverting a
- reverting b
- $ hg import --no-commit ../diffa
- applying ../diffa
- $ hg revert -aC
- reverting a
- $ hg import --no-commit ../diffb
- applying ../diffb
- $ hg revert -aC
- reverting b