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