diff mercurial/simplemerge.py @ 25932:d491f289045f

dispatch: use absolute_import A mixed, ambiguous import has been removed!
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 08 Aug 2015 14:42:48 -0700
parents 83df50a8d61c
children 241a1324a180
line wrap: on
line diff