view tests/test-diff-newlines.t @ 12789:24999db620cd

Merge with mpm
author Steve Borho <steve@borho.org>
date Wed, 20 Oct 2010 15:36:42 -0500
parents bf840a3d1af2
children 05fffd665170
line wrap: on
line source

  $ hg init

  $ python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
  $ 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
newline
  +clean diff