view tests/test-inotify-lookup.t @ 17422:93bc65e970c0 stable

mergetools.hgrc: set vimdiff to check=changed

The standard reaction in from of unexpected vimdiff is to ":quit". This will
make vimdiff return a 0 status even if no merge were done at all.

This change detect that nothing have been changed in vimdiff as a potential
unresolved conflict.

  $ "$TESTDIR/hghave" inotify || exit 80
  $ hg init
  $ echo "[extensions]" > .hg/hgrc
  $ echo "inotify=" >> .hg/hgrc
  $ hg inserve -d --pid-file .hg/inotify.pid
  $ echo a > a
  $ hg ci -Aqm0
  $ hg co -q null
  $ hg co -q
  $ hg st
  $ cat a
  a
  $ kill `cat .hg/inotify.pid`