From 489947cee5095b168cbac111ff7bd1eadbbd90dd Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 23 Jun 2020 22:33:23 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- t/t4013/diff.log_--patch-with-stat_master_--_dir_ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t4013/diff.log_--patch-with-stat_master_--_dir_') diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_ index d5207cadf4..814098fbf8 100644 --- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ +++ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_ @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9 Author: A U Thor Date: Mon Jun 26 00:04:00 2006 +0000 - Merge branch 'side' + Merge branch 'side' into master commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Author: A U Thor -- cgit v1.2.3