diff tests/test-conflict.out @ 727:acee766fcb79

Get commands to raise Abort instead of ui.warn(...),sys.exit(1).
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 19 Jul 2005 07:42:36 -0800
parents eb46971fc57f
children c5df1a9c5276
line wrap: on
line diff