diff tests/test-simplemerge.py @ 35850:8bba684efde7 stable 4.5.2

merge with security patches
author Kevin Bullock <kbullock+mercurial@ringworld.org>
date Tue, 06 Mar 2018 13:17:07 -0600
parents 68c43a416585
children f0b6fbea00cf
line wrap: on
line diff