Merge branch 'jc/diff-algo-cleanup' into maint

* jc/diff-algo-cleanup:
  xdiff: PATIENCE/HISTOGRAM are not independent option bits
  xdiff: remove XDL_PATCH_* macros

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc merge-recursive.c
Simple merge