diff mercurial/merge.py @ 27506:e6d3dad71e44

context: use absolute_import
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 21 Dec 2015 21:51:31 -0800
parents 2e31a17ad1bf
children b8405d739149
line wrap: on
line diff