Mercurial > hg
view tests/test-custom-filters.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 | f3a8b5360100 |
children |
line wrap: on
line source
% Repository data: Some stuff to ponder very carefully. % Fresh checkout: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Copyright 2046, The Masters Some stuff to ponder very carefully. M stuff.txt % Problem encoding: abort: missing header "Copyright 2046, The Masters" in morestuff.txt M stuff.txt A morestuff.txt