log tests/test-merge-internal-tools-pattern.out @ 8555:3e09bc5fee12

age author description
Wed, 04 Mar 2009 13:06:16 -0600 Augie Fackler merge: better error messages to lead users to hg update --clean to abandon merges.
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