This teaches our "diff" machinery to optionally consider lines that are different only in upper/lower-cases to be equivalent. Junio C Hamano (5): xdiff: remove XDL_PATCH_* macros xdiff: PATIENCE/HISTOGRAM are not independent option bits xdiff: introduce XDF_INEXACT_MATCH xdiff: introduce XDF_IGNORE_CASE diff: --ignore-case Documentation/diff-options.txt | 4 +++ diff.c | 8 +++--- diff.h | 2 ++ merge-recursive.c | 4 +-- t/lib-diff-alternative.sh | 45 +++++++++++++++++++++++++++++++-- t/t4033-diff-patience.sh | 6 +++++ t/t4050-diff-histogram.sh | 2 ++ xdiff/xdiff.h | 19 ++++++++------ xdiff/xdiffi.c | 4 +-- xdiff/xhistogram.c | 2 +- xdiff/xpatience.c | 2 +- xdiff/xprepare.c | 21 ++++++++-------- xdiff/xutils.c | 54 ++++++++++++++++++++++++++++++++-------- 13 files changed, 133 insertions(+), 40 deletions(-) -- 1.7.9.1.265.g25f75 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html