equal
deleted
inserted
replaced
402 @@ -1,2 +1,3 @@ |
402 @@ -1,2 +1,3 @@ |
403 -hello world |
403 -hello world |
404 -goodbye world |
404 -goodbye world |
405 +hello world\r (esc) |
405 +hello world\r (esc) |
406 +\r (esc) |
406 +\r (esc) |
407 +goodbye\rworld (esc) |
407 +goodbye\r (no-eol) (esc) |
|
408 world |
408 |
409 |
409 No completely blank lines to ignore: |
410 No completely blank lines to ignore: |
410 |
411 |
411 $ hg ndiff --ignore-blank-lines |
412 $ hg ndiff --ignore-blank-lines |
412 diff -r 540c40a65b78 foo |
413 diff -r 540c40a65b78 foo |
415 @@ -1,2 +1,3 @@ |
416 @@ -1,2 +1,3 @@ |
416 -hello world |
417 -hello world |
417 -goodbye world |
418 -goodbye world |
418 +hello world\r (esc) |
419 +hello world\r (esc) |
419 +\r (esc) |
420 +\r (esc) |
420 +goodbye\rworld (esc) |
421 +goodbye\r (no-eol) (esc) |
|
422 world |
421 |
423 |
422 Only new line noticed: |
424 Only new line noticed: |
423 |
425 |
424 $ hg ndiff --ignore-space-change |
426 $ hg ndiff --ignore-space-change |
425 diff -r 540c40a65b78 foo |
427 diff -r 540c40a65b78 foo |