Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 1916:95b2e14841f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix test failures that depend on when tests run.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 05 Mar 2006 17:08:35 -0800
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)