better version of git-inline-diff