diff tests/test-merge1.out @ 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 5a034646e472
children 67a28636ea64
line wrap: on
line diff