Merge branch 'maint'

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

Conflicts:
	diff.c

1 files changed, 0 insertions, 1 deletions

diff --git a/diff.c b/diff.c
index 2327cea5b..c69252660 100644
--- a/diff.c
+++ b/diff.c
@@ -2620,7 +2620,6 @@ static void fill_metainfo(struct strbuf *msg,
 		}
 		/* fallthru */
 	default:
-		/* nothing */
 		*must_show_header = 0;
 	}
 	if (one && two && hashcmp(one->sha1, two->sha1)) {