| commit | 0f8bd1e7379c63534fcf79e172d684480eeaa5ba | [log] [tgz] |
|---|---|---|
| author | Eike Stepper <stepper@esc-net.de> | Thu Nov 07 11:28:48 2019 +0100 |
| committer | Eike Stepper <stepper@esc-net.de> | Thu Nov 07 11:28:48 2019 +0100 |
| tree | 301e6c71754918f0bed32090233ca9cff5543f7f | |
| parent | 808fd8e4ef743959c8b66c062c9a4b9491f5cf55 [diff] |
[547640] Support server-side commit conflict resolution https://bugs.eclipse.org/bugs/show_bug.cgi?id=547640