tests/test-diff-newlines.t
author Kevin Bullock <kbullock+mercurial@ringworld.org>
Wed, 19 Jul 2017 07:51:41 -0500
branchstable
changeset 33572 857876ebaed4
parent 33305 aaa1f8f514cf
child 39707 5abc47d4ca6b
permissions -rw-r--r--
merge default into stable for code freeze

  $ hg init

  $ $PYTHON -c 'open("a", "wb").write(b"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