Mercurial > hg

annotate tests/test-parseindex2.py.out @ 12765:5eed9ceebd64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: when --tool is specified, disable HGMERGE by setting to empty string HGMERGE has different semantics than ui.merge. HGMERGE should hold the name on an executable in your path, or an absolute tool path. As such, it's not safe to simply copy the user's specified --tool value into HGMERGE. Instead, we disable HGMERGE by setting it to an empty string.
author Steve Borho <steve@borho.org>
date Mon, 18 Oct 2010 23:20:14 -0500
parents 75fdc39b6172
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7110
75fdc39b6172 Add parseindex2.py test case
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
1 done