Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-diff-ignore-whitespace.out
author Patrick Mezard <pmezard@gmail.com>
Wed, 10 Jan 2007 20:35:27 +0100
changeset 4023 6ea8a3b805ee
parent 2594 bdf9d809467c
child 4878 372d93f03d3a
permissions -rw-r--r--
Flush stderr after write. stderr can be buffered under win32 when redirected to a file, including stdout.

adding foo
>>> two diffs showing three added lines <<<
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,5 @@ hello world
+
 hello world
+
 goodbye world
+
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,5 @@ hello world
+
 hello world
+
 goodbye world
+
>>> no diffs <<<
>>> four diffs showing added space first on the first line <<<
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
-hello world
+	 hello world
 goodbye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
-hello world
+	 hello world
 goodbye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
-hello world
+	 hello world
 goodbye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
-hello world
+	 hello world
 goodbye world
>>> two diffs showing space appended to the first line <<<
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
-hello world
+hello world	 
 goodbye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
-hello world
+hello world	 
 goodbye world
>>> no diffs <<<
>>> four diffs showing space inserted into "goodbye" <<<
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
 hello world
-goodbye world
+good bye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
 hello world
-goodbye world
+good bye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
 hello world
-goodbye world
+good bye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
 hello world
-goodbye world
+good bye world
>>> two diffs showing changed whitespace amount in the last line <<<
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
 hello world
-goodbye world
+goodbye		  	world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,2 @@ hello world
 hello world
-goodbye world
+goodbye		  	world
>>> no diffs <<<
>>> four diffs showing added blank line w/horizontal space <<<
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,3 @@ hello world
 hello world
+ 	
 goodbye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,3 @@ hello world
 hello world
+ 	
 goodbye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,3 @@ hello world
 hello world
+ 	
 goodbye world
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
@@ -1,2 +1,3 @@ hello world
 hello world
+ 	
 goodbye world
mercurial-crew-with-dirclash