First pull request back to fzieris, adding merge flag

These are the changes on sender side (git plugin) from entry field to the call of git-client-plugin's merge fct. 
Receiver is git-client plugin.