Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2090:eb40db373717

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix util.canonpath on windows. old test for absolute path was not portable. use os.path api instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 19 Apr 2006 09:08:45 -0700
parents 5c4496ed152d
children b2ae81a7df29
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 'hg update -C' to lose changes)