diff hgmerge @ 1203:cb4c423cbb38

Get test-commit to exit cleanly.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 04 Sep 2005 14:48:33 -0700
parents 9c918287d10b
children 696851b1bba9
line wrap: on
line diff