diff mercurial/merge.py @ 28765:7779f9dfd938

py3: use absolute_import in test-status-inprocess.py
author Robert Stanca <robert.stanca7@gmail.com>
date Mon, 04 Apr 2016 05:19:35 +0300
parents 3ceac01bc29f
children bdc86e178255
line wrap: on
line diff