| commit | d781554b79b50e5c3fe468373e87edf8957d7578 | [log] [tgz] |
|---|---|---|
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | Tue May 17 08:54:18 2011 -0400 |
| committer | Code Review <codereview-daemon@eclipse.org> | Tue May 17 08:54:18 2011 -0400 |
| tree | 319c8f4409ac53987b7aba8cdc3813aff1c9f6a9 | |
| parent | b13ca9121b8f2c6a0ebca1a2a12c4af7e75dfd20 [diff] | |
| parent | 0461ff4f0c7ef505c818dac95286fa852f16eef7 [diff] |
Merge "Optimize MergeAlgorithm if ours or theirs is empty"