Mercurial > hg

diff mercurial/simplemerge.py @ 41417:5c73441a47e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
crecord: always return a str from uihunk.__repr__ Otherwise Python 3 complains about it returning bytes. Differential Revision: https://phab.mercurial-scm.org/D5728
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 26 Jan 2019 16:45:25 -0800
parents e7aa113b14f7
children aaad36b88298
line wrap: on
line diff