Mercurial > hg

diff mercurial/merge.py @ 32353:4bffe2421f34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: remove references to Python 2.6 These are the obvious ones. There is tons of code in this file implementing features from unittest that weren't present in Python 2.6. But that's for other patches.
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 19 May 2017 19:46:45 -0700
parents c568c187102f
children bd56bea5ecf8
line wrap: on
line diff