Mercurial > hg

view tests/test-extra-filelog-entry.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 b51a8138292a
children
line wrap: on
line source

adding b
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       0 1e88685f5dde 000000000000 000000000000