| commit | 34962b4700940221e07371e0a965f02b88b84711 | [log] [tgz] |
|---|---|---|
| author | Matthias Sohn <matthias.sohn@sap.com> | Mon Nov 22 16:43:43 2010 -0500 |
| committer | Code Review <codereview-daemon@eclipse.org> | Mon Nov 22 16:43:43 2010 -0500 |
| tree | 9487a9f8f50dfc1eb46dff42aa20c6317da43906 | |
| parent | a7f6764e01e233f85f9780a5a20e3dd08c65d0db [diff] | |
| parent | 5adef23365a8704b64efb25e49fcf85326beee40 [diff] |
Merge "Fix bug regarding handling of non-versioned files during merge"