Mercurial > hg

diff tests/test-mq @ 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 6c469f2f9f12
children d8d0fc3988ca
line wrap: on
line diff