[467442] Add Interactive Transaction Conflict Resolution 

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