diff() is now gdiff() for git