Mercurial > public > mercurial-scm > hg-stable
diff tests/test-diff-ignore-whitespace.out @ 2594:bdf9d809467c
add missed tests for diff -b/-B
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Tue, 11 Jul 2006 15:51:16 -0700 |
| parents | |
| children | 372d93f03d3a |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-diff-ignore-whitespace.out Tue Jul 11 15:51:16 2006 -0700 @@ -0,0 +1,140 @@ +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