Mercurial > public > mercurial-scm > hg-stable

diff contrib/python3-whitelist @ 37936:c1bc196e021d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: port test-simplemerge.py to Python 3 # skip-blame just b prefixes Differential Revision: https://phab.mercurial-scm.org/D3492
author Augie Fackler <augie@google.com>
date Fri, 27 Apr 2018 10:17:48 -0400
parents a61583cba509
children 2f00c6e8f6a1
line wrap: on
line diff
--- a/contrib/python3-whitelist	Fri Apr 27 10:21:24 2018 -0400
+++ b/contrib/python3-whitelist	Fri Apr 27 10:17:48 2018 -0400
@@ -415,6 +415,7 @@
 test-show-work.t
 test-show.t
 test-simple-update.t
+test-simplemerge.py
 test-single-head.t
 test-sparse-clear.t
 test-sparse-import.t