tree 2a7260bb45ea0025608218a8f7f8011d03aa228c
parent 7a925205dbcd3863d73ea9fa17c4253e2f01f9ff
parent e58bf0870e069fc758d1d9c83b83b8ab80929f34
author Matthias Sohn <matthias.sohn@sap.com> 1622032241 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> 1622032241 -0400

Merge "Add git config for conflict style merge/diff3"