v1.7.0

• Fix #14
• Fix #15

v1.6.0

• feature #12 added. It is now possible to resolve <scm><tag>...</tag></scm> conflicts.

v1.5.0

• fixes #7 where unrelated historie is merged and no base merge commit exists.

v1.4

• Merged Pull Request #5, it is now possible to define a regexp for properties

v1.3

• fixed issue #4: java.lang.IllegalArgumentException: profile [xxx] not found

v1.2

• performance improvements
• not used transitive dependencies excluded resulting in a smaller shaded jar
• you can resolve parent/version conflicts by being prompted what version to use
• refactored the code to use "rules"

v1.1

Changelog:
  - git merge-file -p used, that was wrong. -p print's the result to stdout.

v1.0

v1.0