diff mercurial/merge.py @ 10398:ace3cf2bc991

tests: don't just silently strip port numbers
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 08 Feb 2010 02:53:41 +0100
parents 08a0f04b56bd
children ba5e508b5e92
line wrap: on
line diff