Mercurial > hg
view tests/test-churn.out @ 7785:660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 10 Feb 2009 22:47:38 +0100 |
parents | 2627ef59195d |
children | 7bcce39e8f07 |
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 2 user2 2 *************************************************************** user1 1 ******************************* % churn with aliases alias3 3 ************************************************************** user2 2 ***************************************** alias1 1 ******************** % churn with column specifier user3 3 *********************** user2 2 *************** user1 1 ******* % churn by hour 06 1 ********************** 09 2 ******************************************** 12 3 ******************************************************************