view tests/test-bad-pull.t @ 38220:ad50f0399e1e

graft: correct documentation about options can be reapplied

Now options --user and --date can be reapplied after we hit a conflict.

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

#require serve

  $ hg clone http://localhost:$HGPORT/ copy
  abort: * (glob)
  [255]

  $ test -d copy
  [1]

  $ $PYTHON "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
  $ cat dumb.pid >> $DAEMON_PIDS
  $ hg clone http://localhost:$HGPORT/foo copy2
  abort: HTTP Error 404: * (glob)
  [255]
  $ killdaemons.py