view tests/test-issue4074.t @ 48559:b5e1283c0475

simplemerge: use same newline detection for :mergediff as for :merge[3]

The `:merge` and `:merge3` markers used the newline style detected
from the base input. The `:mergediff` style always used LF as newline
character. This patch teaches `:mergediff` to use the same detection
as the others did.

Differential Revision: https://phab.mercurial-scm.org/D11976

#require no-pure

A script to generate nasty diff worst-case scenarios:

  $ cat > s.py <<EOF
  > import random
  > for x in range(100000):
  >     print
  >     if random.randint(0, 100) >= 50:
  >         x += 1
  >     print(hex(x))
  > EOF

  $ hg init a
  $ cd a

Check in a big file:

  $ "$PYTHON" ../s.py > a
  $ hg ci -qAm0

Modify it:

  $ "$PYTHON" ../s.py > a

Time a check-in, should never take more than 10 seconds user time:

  $ hg ci --time -m1 --config worker.enabled=no
  time: real .* secs .user [0-9][.].* sys .* (re)