Merge branch 'lt/diff'

* lt/diff:
  git diff: support "-U" and "--unified" options properly

diff --cc diff.c
Simple merge