Mercurial > hg

diff mercurial/simplemerge.py @ 36262:2b00dda6dad9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scmutil: bytes-ify IOErrors before wrapping them in abort message Differential Revision: https://phab.mercurial-scm.org/D2292
author Augie Fackler <augie@google.com>
date Sat, 17 Feb 2018 00:29:23 -0500
parents 93c4958d987c
children f0b6fbea00cf
line wrap: on
line diff