[467442] Add Interactive Transaction Conflict Resolution 

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