Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  test-lib: Clean up comments and Makefile.
  diff --no-index: Do not generate patch output if other output is requested

diff --cc diff-no-index.c
Simple merge

diff --cc t/test-lib.sh
Simple merge