[FEATURE] Introduce entry field for git merge flag

This patch introduces and entry field for for a merge flag.
It gets passed along from user merge options jelly to the call of
git.merge of the git client plugin,
where it is written to the environment.

git git client plugin needs an update to get it from the environment.