diff contrib/editmerge @ 32922:eb84b4ad41e5

repair: clarify in comment that caller must take lock, but not transaction I have checked that all callers have already taken the lock (and if they hadn't, we should have seen tests fail thanks to the 'transaction requires locking' devel warning in localrepo.transaction()).
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 19 Jun 2017 11:24:21 -0700
parents 612502900a2d
children
line wrap: on
line diff