Resolve Merge Strategy

JGit now supports the resolve merge strategy providing true content merge.
See the org.eclipse.jgit.api.MergeCommand and tests for examples.