Mercurial > hg

diff mercurial/merge.py @ 31346:2a18e9e6ca43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use bytearray() instead of array('c', ...) constructions Portable from 2.6-3.6.
author Augie Fackler <augie@google.com>
date Sun, 12 Mar 2017 03:32:21 -0400
parents 102d3a30582c
children b6a6df38a802
line wrap: on
line diff