comparison mx/commands.py @ 10039:92cbc5e88484

Do not virtualize when locks do not match at merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 14 Jun 2013 12:11:19 +0200
parents 893bc1dbb58c
children 0d378ea2b822
comparison
equal deleted inserted replaced
10038:9645cfaffc62 10039:92cbc5e88484