view tests/test-backwards-remove.t @ 13566:a87a0fcb412f stable

mergetools: add alternate registry keys for 32bit apps on 64bit O/S

Not all applications needed the workarounds, so I did not add alternate keys for
every Windows merge application.

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ ls
  a
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg co 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

B should disappear

  $ ls
  a