comparison mercurial/filemerge.py @ 39452:481db51c83e9

merge with stable Includes an extra bump of the version number for parsers because the merge produces a new, distinct version of the code.
author Gregory Szorc <gregory.szorc@gmail.com>
date Wed, 05 Sep 2018 09:36:31 -0700
parents bc0eb1dc6aae
children 86dfae98a3a2
comparison
equal deleted inserted replaced
39451:5bfab9400daf 39452:481db51c83e9