Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 2338:391c5d0f9ef3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor typo change to reflect actual values used.
author "Daniel Santa Cruz <dansan@vikus.com>"
date Mon, 22 May 2006 12:17:44 -0400
parents b2ae81a7df29
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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)