| commit | 5835ad1a91de1ef3949579fabe49d9a436f6fe9e | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <spearce@spearce.org> | Fri Nov 05 17:38:44 2010 -0400 |
| committer | Code Review <codereview-daemon@eclipse.org> | Fri Nov 05 17:38:44 2010 -0400 |
| tree | 7f948a617476572bc2641b782ca52c278e0377aa | |
| parent | af4f6c512530f90b1ed1590f4bc88b7aa690182e [diff] | |
| parent | 99771f04bcb6b1a79d4b9c5edff21c994104f8da [diff] |
Merge changes I8d77cb59,I2beb4db5 * changes: Fixed merge algorithm regarding adjacent modifications Cleaned up MergeAlgorithmTest