[467442] Add Interactive Transaction Conflict Resolution 

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