tests/test-merge-revert.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 09 Sep 2005 11:34:34 -0700
changeset 1227 e3ea354d99b2
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
Replace sequences of {ui.warn, return 1} with raise of util.Abort.

1:3aa14bbc23d9
0:8633637036c1
3aa14bbc23d9 tip
8633637036c1
8633637036c1+
8633637036c1
3aa14bbc23d9 tip
merging file1
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip
3aa14bbc23d9 tip