Mercurial > hg
view tests/blacklists/linux-vfat @ 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.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 02 Aug 2012 13:51:49 +0200 |
parents | 6e738a0a3393 |
children | 352abbb0be88 |
line wrap: on
line source
# invalid filenames test-add.t test-init.t test-clone.t test-contrib.t test-hgweb-raw.t test-walk.t # no sockets or fifos test-hup.t test-inotify-debuginotify.t test-inotify-dirty-dirstate.t test-inotify-issue1208.t test-inotify-issue1371.t test-inotify-issue1542.t test-inotify-lookup.t test-inotify.t test-inotify-issue1556.t # no hardlinks test-hardlinks.t test-relink.t # exec bit problems test-convert-bzr-114.t test-convert-bzr-directories.t test-convert-bzr-merges.t test-convert-bzr-treeroot.t test-convert-darcs.t test-merge-tools.t # debugstate exec bit false positives test-dirstate.t test-filebranch.t test-merge-remove.t