Mercurial > hg

view tests/test-merge5.out @ 1368:d1d605d1e839

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix completion function for 'hg pull'. Fix truncation bug and remove tabs.
author Steve Borho <steve@borho.org>
date Sat, 01 Oct 2005 00:02:01 -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)