Mercurial > hg
comparison mercurial/merge.py @ 34571:75bd034a1e00
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
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 10 Oct 2017 11:02:53 -0400 |
| parents | 1248aa48cac9 |
| children | c0a524f77e8a |
comparison
equal
deleted
inserted
replaced
| 34570:dbb2027f4974 | 34571:75bd034a1e00 |
|---|