Mercurial > hg

view tests/test-diff-newlines.t @ 24327:f7c0556d22d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-git: show insane progress bar with octopus merge (issue4169) This is done as a separate change from the fix so that it's obvious what is corrected by the bugfix.
author Augie Fackler <augie@google.com>
date Thu, 12 Mar 2015 21:31:52 -0400
parents c63a09b6b337
children aaa1f8f514cf
line wrap: on
line source

  $ hg init

  $ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
  $ hg ci -Ama -d '1 0'
  adding a

  $ echo clean diff >> a
  $ hg ci -mb -d '2 0'

  $ hg diff -r0 -r1
  diff -r 107ba6f817b5 -r 310ce7989cdc a
  --- a/a	Thu Jan 01 00:00:01 1970 +0000
  +++ b/a	Thu Jan 01 00:00:02 1970 +0000
  @@ -1,2 +1,3 @@
   confuse str.splitlines
   embedded\r (no-eol) (esc)
  newline
  +clean diff