[467442] Add Interactive Transaction Conflict Resolution 

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