Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 2307:5b3a3e35f084

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add section for configuration notes with initial note about the default editor
author Lee Cantey <lcantey@gmail.com>
date Thu, 18 May 2006 10:09:16 -0700
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)