Merge strategy #2

Unit tests not ready yet.

Related Git-plugin pull request:
https://github.com/jenkinsci/git-plugin/pull/170