Mercurial > hg

diff mercurial/merge.py @ 38603:4df549d0f1fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: byte-stringify literals in extension in test-bundle2-exchange.t # skip-blame just some b''
author Yuya Nishihara <yuya@tcha.org>
date Sun, 08 Jul 2018 19:05:00 +0900
parents d4be8ea8f22d
children be4984261611
line wrap: on
line diff