summaryrefslogtreecommitdiff
path: root/t/t4013/diff.show_-c_master
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2020-06-23 22:33:23 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-06-23 17:22:35 -0700
commit489947cee5095b168cbac111ff7bd1eadbbd90dd (patch)
treeee24f367a7b5ded9fd17cdc4172d6c26cb3038fe /t/t4013/diff.show_-c_master
parentThe second batch (diff)
downloadtgif-489947cee5095b168cbac111ff7bd1eadbbd90dd.tar.xz
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.show_-c_master')
-rw-r--r--t/t4013/diff.show_-c_master2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.show_-c_master b/t/t4013/diff.show_-c_master
index 81aba8da96..1c46ed64fd 100644
--- a/t/t4013/diff.show_-c_master
+++ b/t/t4013/diff.show_-c_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
- Merge branch 'side'
+ Merge branch 'side' into master
diff --combined dir/sub
index cead32e,7289e35..992913c