Added diff.algorithm = patience to gitconfig