Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Seifermann2016-09-25 08:21:19 +0000
committerEike Stepper2016-09-25 08:23:04 +0000
commitca3dc4959d1439c96e85a1d1c64c8debd8480686 (patch)
treec6e852b67e982284fcc9f178fa26ce227010e6e9 /plugins/org.eclipse.emf.cdo.dawn.examples.acore
parentb94d1f1df2e55062401a1dbe39a26c80e34c0ede (diff)
downloadcdo-ca3dc4959d1439c96e85a1d1c64c8debd8480686.tar.gz
cdo-ca3dc4959d1439c96e85a1d1c64c8debd8480686.tar.xz
cdo-ca3dc4959d1439c96e85a1d1c64c8debd8480686.zip
[397999] Multiple merges between branches fail
https://bugs.eclipse.org/bugs/show_bug.cgi?id=397999 Signed-off-by: Stephan Seifermann <seifermann@fzi.de> Signed-off-by: Eike Stepper <stepper@esc-net.de> Change-Id: Ic834c983b930f186861a73d7ce9042d845d0e86f
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.examples.acore')
0 files changed, 0 insertions, 0 deletions

Back to the top