Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge2.out @ 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 | 5a034646e472 |
| children | b2ae81a7df29 |
comparison
equal
deleted
inserted
replaced
| 1226:f3837564ed03 | 1227:e3ea354d99b2 |
|---|