Update git diff and merge strategies.