--- a/tests/test-diff-ignore-whitespace.out	Mon Jul 09 17:41:14 2007 +0300
+++ b/tests/test-diff-ignore-whitespace.out	Sat Jul 14 12:44:47 2007 -0500
@@ -1,5 +1,6 @@
 adding foo
 >>> two diffs showing three added lines <<<
+hg diff
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -9,6 +10,7 @@
 +
  goodbye world
 +
+hg diff -b
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -19,7 +21,10 @@
  goodbye world
 +
 >>> no diffs <<<
+hg diff -B
+hg diff -Bb
 >>> four diffs showing added space first on the first line <<<
+hg diff
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -27,6 +32,7 @@
 -hello world
 +	 hello world
  goodbye world
+hg diff -b
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -34,6 +40,7 @@
 -hello world
 +	 hello world
  goodbye world
+hg diff -B
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -41,6 +48,7 @@
 -hello world
 +	 hello world
  goodbye world
+hg diff -Bb
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -49,6 +57,7 @@
 +	 hello world
  goodbye world
 >>> two diffs showing space appended to the first line <<<
+hg diff
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -56,6 +65,7 @@
 -hello world
 +hello world	 
  goodbye world
+hg diff -B
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -64,7 +74,10 @@
 +hello world	 
  goodbye world
 >>> no diffs <<<
+hg diff -b
+hg diff -Bb
 >>> four diffs showing space inserted into "goodbye" <<<
+hg diff
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -72,6 +85,7 @@
  hello world
 -goodbye world
 +good bye world
+hg diff -B
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -79,6 +93,7 @@
  hello world
 -goodbye world
 +good bye world
+hg diff -b
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -86,6 +101,7 @@
  hello world
 -goodbye world
 +good bye world
+hg diff -Bb
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -94,6 +110,7 @@
 -goodbye world
 +good bye world
 >>> two diffs showing changed whitespace amount in the last line <<<
+hg diff
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -101,6 +118,7 @@
  hello world
 -goodbye world
 +goodbye		  	world
+hg diff -B
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -109,7 +127,10 @@
 -goodbye world
 +goodbye		  	world
 >>> no diffs <<<
+hg diff -b
+hg diff -Bb
 >>> four diffs showing added blank line w/horizontal space <<<
+hg diff
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -117,6 +138,15 @@
  hello world
 + 	
  goodbye world
+hg diff -B
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,3 @@ hello world
+ hello world
++ 	
+ goodbye world
+hg diff -b
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
@@ -124,17 +154,136 @@
  hello world
 + 	
  goodbye world
+hg diff -Bb
+>>> three diffs showing added blank line w/other space <<<
+hg diff
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,3 @@ hello world
+-hello world
+-goodbye world
++hello  world
++ 	
++goodbye world 
+hg diff -B
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,3 @@ hello world
+-hello world
+-goodbye world
++hello  world
++ 	
++goodbye world 
+hg diff -b
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
 @@ -1,2 +1,3 @@ hello world
- hello world
+-hello world
+-goodbye world
++hello  world
 + 	
- goodbye world
++goodbye world 
+hg diff -Bb
+>>> four diffs showing changed whitespace <<<
+hg diff
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,2 @@ hello world
+-hello world
+-goodbye world
++helloworld
++goodbye	world 
+hg diff -B
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,2 @@ hello world
+-hello world
+-goodbye world
++helloworld
++goodbye	world 
+hg diff -b
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,2 @@ hello world
+-hello world
+-goodbye world
++helloworld
++goodbye	world 
+hg diff -Bb
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,2 @@ hello world
+-hello world
+-goodbye world
++helloworld
++goodbye	world 
+hg diff -w
+>>> five diffs showing changed whitespace <<<
+hg diff
 diff -r 540c40a65b78 foo
 --- a/foo
 +++ b/foo
-@@ -1,2 +1,3 @@ hello world
- hello world
-+ 	
- goodbye world
+@@ -1,2 +1,5 @@ hello world
+-hello world
+-goodbye world
++helloworld
++
++
++
++goodbye	world 
+hg diff -B
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,5 @@ hello world
+-hello world
+-goodbye world
++helloworld
++
++
++
++goodbye	world 
+hg diff -b
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,5 @@ hello world
+-hello world
+-goodbye world
++helloworld
++
++
++
++goodbye	world 
+hg diff -Bb
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,5 @@ hello world
+-hello world
+-goodbye world
++helloworld
++
++
++
++goodbye	world 
+hg diff -w
+diff -r 540c40a65b78 foo
+--- a/foo
++++ b/foo
+@@ -1,2 +1,5 @@ hello world
+-hello world
+-goodbye world
++helloworld
++
++
++
++goodbye	world 
+hg diff -wB