[467442] Add Interactive Transaction Conflict Resolution 

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