Mercurial > hg > mercurial-crew-with-dirclash
diff setup.py @ 2552:bb403d427974
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:28:31 +0200 |
parents | 82cef38fea56 |
children | 3dba9ec89164 |