Mercurial > hg

view tests/test-context.py.out @ 18694:6a012704c841

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bd23d5f28bbb
children 232038a05fdb
line wrap: on
line source

workingfilectx.date = (1000, 0)
ASCII   : Gr?ezi!
Latin-1 : Grüezi!
UTF-8   : Grüezi!