--- v4
+++ v5
@@ -11,10 +11,10 @@
  1 file changed, 11 insertions(+), 8 deletions(-)
 
 diff --git a/builtin/branch.c b/builtin/branch.c
-index 9b300cf42f..3b010c1d2c 100644
+index d785ebdba0..6c0069bf00 100644
 --- a/builtin/branch.c
 +++ b/builtin/branch.c
-@@ -616,14 +616,15 @@ static int edit_branch_description(const char *branch_name)
+@@ -621,14 +621,15 @@ static int edit_branch_description(const char *branch_name)
  
  int cmd_branch(int argc, const char **argv, const char *prefix)
  {
@@ -35,7 +35,7 @@
  	static struct ref_sorting *sorting;
  	struct string_list sorting_options = STRING_LIST_INIT_DUP;
  	struct ref_format format = REF_FORMAT_INIT;
-@@ -708,8 +709,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
+@@ -713,8 +714,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
  	    filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
  		list = 1;
  
@@ -48,7 +48,7 @@
  		usage_with_options(builtin_branch_usage, options);
  
  	if (filter.abbrev == -1)
-@@ -849,7 +852,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
+@@ -854,7 +857,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
  		strbuf_addf(&buf, "branch.%s.merge", branch->name);
  		git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
  		strbuf_release(&buf);