Merge branch 'jt/diff-pairs'

A post-processing filter for "diff --raw" output has been
introduced.

* jt/diff-pairs:
  builtin/diff-pairs: allow explicit diff queue flush
  builtin: introduce diff-pairs command
  diff: add option to skip resolving diff statuses
  diff: return diff_filepair from diff queue helpers

diff --cc Documentation/meson.build
Simple merge

diff --cc Makefile
Simple merge

diff --cc builtin.h
Simple merge

diff --cc diff.h
Simple merge

diff --cc meson.build
Simple merge

diff --cc t/meson.build
Simple merge