Mercurial > hg > pyhgsh

view tests/test-merge5.out @ 2280:09ed44225571

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
On Windows look for mercurial.ini in $USERPROFILE, too, if available as os.path.expanduser('~') does not always yield a useful directory. Based on a patch from Edouard Gomez <ed.gomez@free.fr>
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 14 May 2006 18:24:32 +0200
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)