Mercurial > hg
view tests/test-lock-badness.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 | a1914d214579 |
children | e54a078153f7 |
line wrap: on
line source
$ "$TESTDIR/hghave" unix-permissions || exit 80 $ hg init a $ echo a > a/a $ hg -R a ci -A -m a adding a $ hg clone a b updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b > b/b $ hg -R b ci -A -m b adding b $ chmod 100 a/.hg/store $ hg -R b push a pushing to a abort: could not lock repository a: Permission denied [255] $ chmod 700 a/.hg/store