diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:46 -0800 |
| commit | 596ad33080472653faa03763b1e0f3a6787e25d4 (patch) | |
| tree | 5cebe3f44f06b7b2b6ffa8b965847a67f2496e33 /mergetools/ecmerge | |
| parent | Merge branch 've/userdiff-bash' (diff) | |
| parent | t1400: prepare for `main` being default branch name (diff) | |
| download | tgif-596ad33080472653faa03763b1e0f3a6787e25d4.tar.xz | |
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
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions