From: Junio C Hamano <redacted>
Date: Mon, 2 Nov 2020 21:17:46 +0000 (-0800)
Subject: Merge branch 'js/default-branch-name-part-4-minus-1'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=596ad33080472653faa03763b1e0f3a6787e25d4;p=git.git

Merge branch 'js/default-branch-name-part-4-minus-1'

Adjust tests so that they won't scream when the default initial
branch name is changed to 'main'.

* js/default-branch-name-part-4-minus-1:
  t1400: prepare for `main` being default branch name
  tests: prepare aligned mentions of the default branch name
  t9902: prepare a test for the upcoming default branch name
  t3200: prepare for `main` being shorter than `master`
  t5703: adjust a test case for the upcoming default branch name
  t6200: adjust suppression pattern to also match "main"
  tests: start moving to a different default main branch name
  t9801: use `--` in preparation for default branch rename
  fmt-merge-msg: also suppress "into main" by default
---

596ad33080472653faa03763b1e0f3a6787e25d4