Mercurial > hg

comparison mercurial/simplemerge.py @ 39485:42bc1c70a6b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wireprotov2peer: report exceptions in frame handling against request future Otherwise the future may never resolve, which could cause deadlock. Differential Revision: https://phab.mercurial-scm.org/D4440
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 23 Aug 2018 13:50:47 -0700
parents e7aa113b14f7
children aaad36b88298
comparison
equal deleted inserted replaced
39484:98995b689e03 39485:42bc1c70a6b8