| commit | 236e9dd9e0edd690c474302531b99ba2d1257459 | [log] [tgz] |
|---|---|---|
| author | kkomissarchik <kkomissarchik> | Thu Jul 13 02:36:51 2006 +0000 |
| committer | kkomissarchik <kkomissarchik> | Thu Jul 13 02:36:51 2006 +0000 |
| tree | cbb82efb055e426c3c772a8f55d568cb79c5973e | |
| parent | 37f87414b0fc7f399270325df8870eecc4fe5227 [diff] |
Fixed a couple of issues with conflict detection code not picking up on indirect conflicts in all cases. Added test cases.