Merge branch 'maint'

* maint:
Update draft release notes to 1.7.1.1
tests: remove unnecessary '^' from 'expr' regular expression

Conflicts:
diff.c

diff --cc diff.c
Simple merge

diff --cc t/t7005-editor.sh
Simple merge

diff --cc t/t7006-pager.sh
Simple merge