but declared in GiClient, so would like to stay agnostic. 
If JGit MergeStrategy don't offer equivalent CLI options (didn't check), please change enum name to GitMergeStrategy to avoid explicitly depending on CLI
I also wonder switching to a MergeCommand (like clone does) would make this more flexible for future extensions. Git merge has a bunch of option that may be useful.