diff tests/test-conflict @ 1227:e3ea354d99b2

Replace sequences of {ui.warn, return 1} with raise of util.Abort.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 09 Sep 2005 11:34:34 -0700
parents 0902ffece4b4
children c71420b186b0
line wrap: on
line diff