Mercurial > hg > truffle
diff test/Makefile @ 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 | 393fd4ef89c4 |
children | d96f52012aaa |