log tests/test-merge-internal-tools-pattern.out @ 7158:d1d011accf94

age author description
Mon, 14 Apr 2008 23:28:50 +0200 Patrick Mezard Merge with crew-stable, fix test output
Fri, 04 Apr 2008 02:20:58 +0300 Dov Feldstern test that internal merge tools are used when set for a merge-pattern in hgrc