Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2023:3bdd3bf17cfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use [ x = y ] instead of [ x == y ] in shell scripts.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 30 Mar 2006 18:43:46 +0200
parents ced2d3620f95
children 5c4496ed152d
line wrap: on
line source

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