Mercurial > hg
view tests/test-diff-ignore-whitespace.out @ 4114:d5011e347476
Merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 26 Feb 2007 12:12:29 -0600 |
| parents | bdf9d809467c |
| children | 372d93f03d3a |
line wrap: on
line source
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