diff setup.py @ 14721:4fcde634f5e0 stable

revert: be more helpful on uncommitted merges BEFORE: $ hg revert abort: no files or directories specified (use --all to discard all changes) AFTER: $ hg revert abort: no files or directories specified (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
author Adrian Buehlmann <adrian@cadifra.com>
date Wed, 22 Jun 2011 15:34:33 +0200
parents 3818c67a501e
children 5656cb5b9028 f4bc0b9e03a4
line wrap: on
line diff