Mercurial > hg

view tests/test-bad-pull.out @ 6521:a3668330f14a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:20:58 +0300
parents 5eb02f9ed804
children 490e40816cbd
line wrap: on
line source

abort: error: Connection refused
255
copy: No such file or directory
abort: HTTP Error 404
0