diff mercurial/merge.py @ 27046:37fcfe52c68c

hgweb: use absolute_import
author Yuya Nishihara <yuya@tcha.org>
date Sat, 31 Oct 2015 22:07:40 +0900
parents de7bf242644e
children 86290f6f6599
line wrap: on
line diff