Mercurial > hg
view tests/test-inotify-issue1371.t @ 18694:6a012704c841
mergetools: vimdiff issue a warning explaining how to abort
Adds a message displayed at each vimdiff invocation:
merge conflict detected, type ":cq" to abort
Vimdiff is very confusing for non-vim user (not to speak about vim user confused
anyway. However it is very likely that vimdiff is picked as the mergetool of
choice when using the default config:
- vim is available on all UNIX system.
- Its one of the rare non graphical merge tools.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 15 Feb 2013 11:28:04 +0100 |
parents | f58175f409b0 |
children |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ hg init $ touch a b c d e f $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH inserve $ hg inserve -d --pid-file=hg.pid 2>&1 $ cat hg.pid >> "$DAEMON_PIDS" $ hg ci -Am m adding a adding b adding c adding d adding e adding f adding hg.pid let the daemon finish its stuff $ sleep 1 eed to test all file operations $ hg rm a $ rm b $ echo c >> c $ touch g $ hg add g $ hg mv e h $ hg status M c A g A h R a R e ! b $ sleep 1 Are we able to kill the service? if not, the service died on some error $ "$TESTDIR/killdaemons.py" hg.pid