diff hgext/transplant.py @ 27458:d39e743e3578

rebase: mention conflict in documentation instead of merge
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:32:15 +0000
parents 43c00ca887d1
children 42910f9fffeb
line wrap: on
line diff