Mercurial > hg
view tests/test-mq-qrefresh-replace-log-message.out @ 6521:a3668330f14a
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 | 448eb46d4d84 |
children | fb32ae9c76e7 |
line wrap: on
line source
======================= Should fail if no patches applied No patches applied No patches applied ======================= Should display 'First commit message' description: First commit message ======================= Should display 'Second commit message' description: Second commit message ======================= Should display 'Third commit message\n This is the 3rd log message' description: Third commit message This is the 3rd log message ======================= Should display 'Fifth commit message\n This is the 5th log message' description: Fifth commit message