Git's default merge option is changing.