Mercurial > hg

diff mercurial/merge.py @ 36574:45f149bf08d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templatekw: fix dict construction in _showlist to not mix bytes and strs What we had was fine on Python 2, but was slightly wrong on Python 3. This works on both. Differential Revision: https://phab.mercurial-scm.org/D2554
author Augie Fackler <augie@google.com>
date Fri, 02 Mar 2018 09:09:38 -0500
parents 1d99260c3a81
children 658b1d28813c
line wrap: on
line diff