2 Commits

Author	SHA1	Message	Date
Augie Fackler	5c67bd6e5c	tests: use readlink.py instead of readlink ... The latter doesn't always exist, such as on Solaris-derived platforms. Differential Revision: https://phab.mercurial-scm.org/D998	2017-10-10 11:02:53 -04:00
Mark Thomas	577a671495	tests: add test for path conflicts during merge ... Differential Revision: https://phab.mercurial-scm.org/D787	2017-10-02 14:05:30 -07:00