I20130201-0411 in master
[396804] CDOMergingConflictResolver tests 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
8 files changed
tree: 02b15520b4320ea169b60abadc7cafd154444bda
  1. features/
  2. plugins/
  3. .gitattributes
  4. .gitignore