use colordiff if it exists
add -u to diff