Update Git to use tkdiff