Mercurial Mercurial > hg / 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 Thomas Arendsen Hein <thomas@intevation.de>
Sat, 23 Jun 2007 20:22:17 +0200
changeset 4687 b5bbfa18daf7
parent 2594 bdf9d809467c
child 4878 372d93f03d3a
permissions -rw-r--r--
hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)

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