Mercurial > hg

view tests/test-merge8.out @ 11353:f2b25e8ea6c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: when current branch has 1 or > 2 heads, actually abort. Currently merge just prints abort-like messages to stderr and then exits with a misleading status 0 (cleverly disguised as "False"). With this change it raises Abort, just like every other fatal error.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 14 Jun 2010 16:06:52 -0400
parents a3d73b3e1f8a
children
line wrap: on
line source

updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved