Mercurial > hg

comparison mercurial/merge.py @ 11624:67260651d09d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
protocol: convert StreamException to generated error code This makes it much easier to handle these errors at the transport level.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 16 Jul 2010 22:20:19 +0200
parents 34e33d50c26b
children eb07fbc21e9c db426935fa94
comparison
equal deleted inserted replaced
11623:31d0a6d50ee2 11624:67260651d09d