Mercurial > hg

view tests/test-diff-newlines.t @ 42761:5c285c8e4f98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unshelve: abort on using --keep and --interactive together I am working on making interactive mode support `--keep` flag. Until we support the usage of `--interactive` and `--keep` together, let us abort on it. Differential Revision: https://phab.mercurial-scm.org/D6699
author Navaneeth Suresh <navaneeths1998@gmail.com>
date Thu, 15 Aug 2019 20:43:25 +0530
parents 5abc47d4ca6b
children 55c6ebd11cb9
line wrap: on
line source

  $ 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