Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3917:a413f5c29c46
Fix test-hup for different output of ls on at least MacOS X and Solaris 8.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 16 Dec 2006 23:24:30 +0100 |
parents | c0a12e6441a5 |
children | 1e0b94cfba0e c95060a5391a |