diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-06-24 01:33:23 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-06-24 03:22:35 +0300 |
commit | 489947cee5095b168cbac111ff7bd1eadbbd90dd (patch) | |
tree | ee24f367a7b5ded9fd17cdc4172d6c26cb3038fe /t/t4013-diff-various.sh | |
parent | 0313f36c6ebecb3bffe6f15cf25a4883100f0214 (diff) |
fmt-merge-msg: stop treating `master` specially
In the context of many projects renaming their primary branch names away
from `master`, Git wants to stop treating the `master` branch specially.
Let's start with `git fmt-merge-msg`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013-diff-various.sh')
-rwxr-xr-x | t/t4013-diff-various.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 3f60f7d96c..43267d6024 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -117,12 +117,12 @@ test_expect_success setup ' : <<\EOF ! [initial] Initial - * [master] Merge branch 'side' + * [master] Merge branch 'side' into master ! [rearrange] Rearranged lines in dir/sub ! [side] Side ---- + [rearrange] Rearranged lines in dir/sub - - [master] Merge branch 'side' + - [master] Merge branch 'side' into master * + [side] Side * [master^] Third * [master~2] Second |