Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 1558:651690fe6be3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix run-tests' PYTHONPATH Specify the installation directory for python modules so we can set PYTHONPATH without guessing.
author Robin Farine <robin.farine@terminus.org>
date Sun, 27 Nov 2005 16:37:18 +0100
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)