Mercurial > hg > truffle
comparison mx/.pydevproject @ 9382:b59b10ddc797
Do not combine merge with succeeding merge if it holds a stateAfter and the succeeding merge does not.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sun, 28 Apr 2013 06:31:30 +0200 |
parents | 527724d26036 |
children |
comparison
equal
deleted
inserted
replaced
9381:addc2a25d727 | 9382:b59b10ddc797 |
---|