Merge strategy

Merge strategy in JGIT looks awful, so I decided to implement it only for CLI git. For JGIT we will have the warning.

Related Git-plugin pull request:
https://github.com/jenkinsci/git-plugin/pull/170