diff hgmerge @ 2529:9419855309cd

Some systems are slower ... give 'em some time/
author Sascha Wilde <wilde@sha-bang.de>
date Tue, 27 Jun 2006 22:50:33 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff