Merge branch 'ab/diff-free-more'

Leakfixes.

* ab/diff-free-more:
  diff.[ch]: have diff_free() free options->parseopts
  diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)

diff --cc blame.c
Simple merge

diff --cc builtin/reset.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc notes-merge.c
Simple merge