diff mercurial/merge.py @ 37924:32106c474086

tests: port test-dispatch.py to Python 3 Differential Revision: https://phab.mercurial-scm.org/D3511
author Augie Fackler <augie@google.com>
date Fri, 27 Apr 2018 11:57:15 -0400
parents 7269b87f817c
children 000039f6ca2d 1322ae04d3d7
line wrap: on
line diff