[505654] Support automatic remerging / multiple merges from the same branch

https://bugs.eclipse.org/bugs/show_bug.cgi?id=505654
52 files changed
tree: 762a6a3a0884d54e0cd117ee0c3f06af98607e3f
  1. features/
  2. plugins/
  3. .gitattributes
  4. .gitignore