Merge branch 'maint'

* maint:
  add, merge, diff: do not use strcasecmp to compare config variable names

diff --cc builtin/add.c
Simple merge

diff --cc merge-recursive.c
Simple merge