Mercurial > hg-stable

view tests/test-diff-newlines.t @ 23111:0dae9147c3b6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: refer ":merge3" instead of "internal:merge3" According to warning message (introduced by 38e0363dcbe0) in filemerge.py, the former should be used as official name.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 01 Nov 2014 02:43:08 +0900
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