view tests/test-merge8.t @ 26119:65d2538ac993 stable

wix: avoid an abort with 'hg help -k foo'

Previously:

 $ /c/Program\ Files/Mercurial/hg help -k merge-tools
 abort: No such file or directory: c:\Program Files\Mercurial\help\scripting.txt

The Inno installer seems OK, but the TortoiseHg required the same fix.  That got
queued with an additional change of 'helpFolder.guid' in guids.wxi (probably by
Steve).  I'm not sure if that is necessary here too.

Test for changeset ba7c74081861
(update dirstate correctly for non-branchmerge updates)
  $ hg init a
  $ cd a
  $ echo a > a
  $ hg add a
  $ hg commit -m a
  $ cd ..
  $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd a
  $ hg mv a b
  $ hg commit -m move
  $ echo b >> b
  $ hg commit -m b
  $ cd ../b
  $ hg pull ../a
  pulling from ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  (run 'hg update' to get a working copy)
  $ hg update
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ cd ..