Mercurial > hg

diff tests/test-simplemerge.py @ 7821:9fe7e6acf525

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents e75aab656f46
children 08a0f04b56bd
line wrap: on
line diff