Adapt git-merge option when git version greater then 2.9