diff tests/test-merge7.t @ 26498:e8564e04382d

lock: add a way to prevent locks from being inherited We want to prevent locks from being inherited sometimes (e.g. when there's a currently running transaction, which will break a lot of assumptions we're making in here.)
author Siddharth Agarwal <sid0@fb.com>
date Tue, 06 Oct 2015 13:13:31 -0700
parents bd625cd4e5e7
children d8463a743d7d
line wrap: on
line diff