Merge branch 'maint'

* maint:
  merge-file: handle empty files gracefully
  merge-recursive: handle file mode changes
  Minor wording changes in the keyboard descriptions in git-add --interactive.
  git fetch: Take '-n' to mean '--no-tags'
  quiltimport: fix misquoting of parsed -p<num> parameter
  git-quiltimport: better parser to grok "enhanced" series files.

diff --cc builtin-fetch.c
Simple merge

diff --cc builtin-merge-file.c
Simple merge

diff --cc builtin-merge-recursive.c
Simple merge

diff --cc xdiff-interface.c
Simple merge