Mercurial > hg

view tests/test-churn.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 f8feaa665319
children 2627ef59195d
line wrap: on
line source

% create test repository
adding a
adding b
adding c
% churn all
user3      3 ***************************************************************
user2      2 ******************************************
user1      1 *********************
% churn up to rev 1
user2      2 ***************************************************************
user1      1 *******************************
% churn with aliases
alias3      3 **************************************************************
user2       2 *****************************************
alias1      1 ********************
% churn with column specifier
user3      3 ***********************
user2      2 ***************
user1      1 *******