2 Commits

Author	SHA1	Message	Date
Patrick Mezard	6b3f1e7d00	test-merge-internal-tools-pattern: make executable	2008-04-14 23:21:27 +02:00
Dov Feldstern	2451adfa26	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.	2008-04-04 02:20:58 +03:00