Merge branch 'so/combine-diff-simplify'

Code simplification.

* so/combine-diff-simplify:
  diff: get rid of redundant 'dense' argument

diff --cc diff-lib.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc log-tree.c
Simple merge

diff --cc submodule.c
Simple merge