Add failing merge cases, and fix now visible bug

Also need fix of git-client-plugin :
https://github.com/jenkinsci/git-client-plugin/pull/9