Mercurial > hg

comparison tests/test-merge-local.t @ 14721:4fcde634f5e0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4134686b83e1
children 2371f4aea665
comparison
equal deleted inserted replaced
14720:36283a7b6856 14721:4fcde634f5e0