Merge branch 'maint'

* maint:
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/Makefile
Simple merge

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