Mercurial > hg

diff mercurial/help/glossary.txt @ 11451:51021f4c80b5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.
author Martin Geisler <mg@lazybytes.net>
date Sun, 27 Jun 2010 23:12:05 +0200
parents 9fa255c32406
children 9d905b9769af
line wrap: on
line diff