git diff --patience is much better!