Mercurial > hg

comparison mercurial/filemerge.py @ 41432:080a5c83914f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: conditionalize some LFS test output I'm not sure why the one stackframe is py2 only, but that seems harmless. The remaining failure is LfsCorruptionError printing the fully qualified name, as well as b'' around its message.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 27 Jan 2019 20:58:18 -0500
parents 876494fd967d
children faa49a5914bb
comparison
equal deleted inserted replaced
41431:0b636d1720a0 41432:080a5c83914f