Update gitconfig.bak

Added [merge] options