Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1227:e3ea354d99b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)