Merge branches 'master' and 'jc/combine' into next

* master:
Add git-clean command
diff_flush(): leakfix.
parse_date(): fix parsing 03/10/2006

* jc/combine:
combine-diff: refactor built-in xdiff interface.

diff --cc Makefile
Simple merge

diff --cc diff.c
Simple merge