[467442] Add Interactive Transaction Conflict Resolution 

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=467442
16 files changed
tree: d81806e5c849224e7248dd12b23adf63a6126136
  1. features/
  2. plugins/
  3. .gitattributes
  4. .gitignore