view tests/test-filecache.py.out @ 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 dca59d5be12d
children 3e4a944c0d04
line wrap: on
line source

basic:

creating
creating
creating
creating

fakeuncacheable:

creating
creating
creating
creating
creating
creating