add mergeoptions no edit gitconfig
Merge branch 'master' of github.com:GauthierD-/dotfiles