diff --git a/range-diff.c b/range-diff.c
index cac89a2f4f..12927e24f7 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -401,26 +401,32 @@ static void output_pair_header(struct diff_options *diffopt,
 		status = '=';
 	}
 
+	/* "num_a ! num_b" or "num_a = num_b" */
 	strbuf_reset(buf);
 	strbuf_addstr(buf, status == '!' ? color_old : color);
 	if (!a_util)
-		strbuf_addf(buf, "%*s:  %s ", patch_no_width, "-", dashes->buf);
+		strbuf_addf(buf, "%*s ", patch_no_width, "-");
 	else
-		strbuf_addf(buf, "%*d:  %s ", patch_no_width, a_util->i + 1,
-			    find_unique_abbrev(&a_util->oid, DEFAULT_ABBREV));
-
-	if (status == '!')
-		strbuf_addf(buf, "%s%s", color_reset, color);
+		strbuf_addf(buf, "%*d ", patch_no_width, a_util->i + 1);
 	strbuf_addch(buf, status);
-	if (status == '!')
-		strbuf_addf(buf, "%s%s", color_reset, color_new);
-
 	if (!b_util)
-		strbuf_addf(buf, " %*s:  %s", patch_no_width, "-", dashes->buf);
+		strbuf_addf(buf, " %*s ", patch_no_width, "-");
 	else
-		strbuf_addf(buf, " %*d:  %s", patch_no_width, b_util->i + 1,
-			    find_unique_abbrev(&b_util->oid, DEFAULT_ABBREV));
+		strbuf_addf(buf, " %*d ", patch_no_width, b_util->i + 1);
 
+	/* "commit_a commit_b : " */
+	if (!a_util)
+		strbuf_addstr(buf, dashes->buf);
+	else
+		strbuf_addstr(buf,
+			      find_unique_abbrev(&a_util->oid, DEFAULT_ABBREV));
+	strbuf_addch(buf, ' ');
+	if (!b_util)
+		strbuf_addstr(buf, dashes->buf);
+	else
+		strbuf_addstr(buf,
+			      find_unique_abbrev(&b_util->oid, DEFAULT_ABBREV));
+	strbuf_addstr(buf, " :");
 	commit = lookup_commit_reference(the_repository, oid);
 	if (commit) {
 		if (status == '!')
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index e30bc48a29..3271f544fe 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -133,10 +133,10 @@ test_expect_success 'simple A..B A..C (unmodified)' '
 	git range-diff --no-color main..topic main..unmodified \
 		>actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
-	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
+	1 = 1 $(test_oid t1) $(test_oid u1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid u2) : s/4/A/
+	3 = 3 $(test_oid t3) $(test_oid u3) : s/11/B/
+	4 = 4 $(test_oid t4) $(test_oid u4) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -156,7 +156,7 @@ test_expect_success 'simple A B C (unmodified)' '
 test_expect_success 'A^! and A^-<n> (unmodified)' '
 	git range-diff --no-color topic^! unmodified^-1 >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t4) = 1:  $(test_oid u4) s/12/B/
+	1 = 1 $(test_oid t4) $(test_oid u4) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -169,10 +169,10 @@ test_expect_success 'A^{/..} is not mistaken for a range' '
 test_expect_success 'trivial reordering' '
 	git range-diff --no-color main topic reordered >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid r1) s/5/A/
-	3:  $(test_oid t3) = 2:  $(test_oid r2) s/11/B/
-	4:  $(test_oid t4) = 3:  $(test_oid r3) s/12/B/
-	2:  $(test_oid t2) = 4:  $(test_oid r4) s/4/A/
+	1 = 1 $(test_oid t1) $(test_oid r1) : s/5/A/
+	3 = 2 $(test_oid t3) $(test_oid r2) : s/11/B/
+	4 = 3 $(test_oid t4) $(test_oid r3) : s/12/B/
+	2 = 4 $(test_oid t2) $(test_oid r4) : s/4/A/
 	EOF
 	test_cmp expect actual
 '
@@ -180,10 +180,10 @@ test_expect_success 'trivial reordering' '
 test_expect_success 'removed a commit' '
 	git range-diff --no-color main topic removed >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid d1) s/5/A/
-	2:  $(test_oid t2) < -:  $(test_oid __) s/4/A/
-	3:  $(test_oid t3) = 2:  $(test_oid d2) s/11/B/
-	4:  $(test_oid t4) = 3:  $(test_oid d3) s/12/B/
+	1 = 1 $(test_oid t1) $(test_oid d1) : s/5/A/
+	2 < - $(test_oid t2) $(test_oid __) : s/4/A/
+	3 = 2 $(test_oid t3) $(test_oid d2) : s/11/B/
+	4 = 3 $(test_oid t4) $(test_oid d3) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -191,11 +191,11 @@ test_expect_success 'removed a commit' '
 test_expect_success 'added a commit' '
 	git range-diff --no-color main topic added >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid a1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid a2) s/4/A/
-	-:  $(test_oid __) > 3:  $(test_oid a3) s/6/A/
-	3:  $(test_oid t3) = 4:  $(test_oid a4) s/11/B/
-	4:  $(test_oid t4) = 5:  $(test_oid a5) s/12/B/
+	1 = 1 $(test_oid t1) $(test_oid a1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid a2) : s/4/A/
+	- > 3 $(test_oid __) $(test_oid a3) : s/6/A/
+	3 = 4 $(test_oid t3) $(test_oid a4) : s/11/B/
+	4 = 5 $(test_oid t4) $(test_oid a5) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -203,10 +203,10 @@ test_expect_success 'added a commit' '
 test_expect_success 'new base, A B C' '
 	git range-diff --no-color main topic rebased >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid b1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid b2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid b3) s/11/B/
-	4:  $(test_oid t4) = 4:  $(test_oid b4) s/12/B/
+	1 = 1 $(test_oid t1) $(test_oid b1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid b2) : s/4/A/
+	3 = 3 $(test_oid t3) $(test_oid b3) : s/11/B/
+	4 = 4 $(test_oid t4) $(test_oid b4) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -215,11 +215,11 @@ test_expect_success 'new base, B...C' '
 	# this syntax includes the commits from main!
 	git range-diff --no-color topic...rebased >actual &&
 	cat >expect <<-EOF &&
-	-:  $(test_oid __) > 1:  $(test_oid b5) unrelated
-	1:  $(test_oid t1) = 2:  $(test_oid b1) s/5/A/
-	2:  $(test_oid t2) = 3:  $(test_oid b2) s/4/A/
-	3:  $(test_oid t3) = 4:  $(test_oid b3) s/11/B/
-	4:  $(test_oid t4) = 5:  $(test_oid b4) s/12/B/
+	- > 1 $(test_oid __) $(test_oid b5) : unrelated
+	1 = 2 $(test_oid t1) $(test_oid b1) : s/5/A/
+	2 = 3 $(test_oid t2) $(test_oid b2) : s/4/A/
+	3 = 4 $(test_oid t3) $(test_oid b3) : s/11/B/
+	4 = 5 $(test_oid t4) $(test_oid b4) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -227,9 +227,9 @@ test_expect_success 'new base, B...C' '
 test_expect_success 'changed commit' '
 	git range-diff --no-color topic...changed >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
+	1 = 1 $(test_oid t1) $(test_oid c1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid c2) : s/4/A/
+	3 ! 3 $(test_oid t3) $(test_oid c3) : s/11/B/
 	    @@ file: A
 	      9
 	      10
@@ -239,7 +239,7 @@ test_expect_success 'changed commit' '
 	      12
 	      13
 	      14
-	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
+	4 ! 4 $(test_oid t4) $(test_oid c4) : s/12/B/
 	    @@ file
 	     @@ file: A
 	      9
@@ -256,10 +256,10 @@ test_expect_success 'changed commit' '
 test_expect_success 'changed commit with --no-patch diff option' '
 	git range-diff --no-color --no-patch topic...changed >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
-	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
+	1 = 1 $(test_oid t1) $(test_oid c1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid c2) : s/4/A/
+	3 ! 3 $(test_oid t3) $(test_oid c3) : s/11/B/
+	4 ! 4 $(test_oid t4) $(test_oid c4) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -267,12 +267,12 @@ test_expect_success 'changed commit with --no-patch diff option' '
 test_expect_success 'changed commit with --stat diff option' '
 	git range-diff --no-color --stat topic...changed >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
+	1 = 1 $(test_oid t1) $(test_oid c1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid c2) : s/4/A/
+	3 ! 3 $(test_oid t3) $(test_oid c3) : s/11/B/
 	     a => b | 2 +-
 	     1 file changed, 1 insertion(+), 1 deletion(-)
-	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
+	4 ! 4 $(test_oid t4) $(test_oid c4) : s/12/B/
 	     a => b | 2 +-
 	     1 file changed, 1 insertion(+), 1 deletion(-)
 	EOF
@@ -282,9 +282,9 @@ test_expect_success 'changed commit with --stat diff option' '
 test_expect_success 'changed commit with sm config' '
 	git range-diff --no-color --submodule=log topic...changed >actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
+	1 = 1 $(test_oid t1) $(test_oid c1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid c2) : s/4/A/
+	3 ! 3 $(test_oid t3) $(test_oid c3) : s/11/B/
 	    @@ file: A
 	      9
 	      10
@@ -294,7 +294,7 @@ test_expect_success 'changed commit with sm config' '
 	      12
 	      13
 	      14
-	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
+	4 ! 4 $(test_oid t4) $(test_oid c4) : s/12/B/
 	    @@ file
 	     @@ file: A
 	      9
@@ -311,8 +311,8 @@ test_expect_success 'changed commit with sm config' '
 test_expect_success 'renamed file' '
 	git range-diff --no-color --submodule=log topic...renamed-file >actual &&
 	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid n1) s/5/A/
-	2:  $(test_oid t2) ! 2:  $(test_oid n2) s/4/A/
+	1 = 1 $(test_oid t1) $(test_oid n1) : s/5/A/
+	2 ! 2 $(test_oid t2) $(test_oid n2) : s/4/A/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -325,7 +325,7 @@ test_expect_success 'renamed file' '
 	    Z@@
 	    Z 1
 	    Z 2
-	3:  $(test_oid t3) ! 3:  $(test_oid n3) s/11/B/
+	3 ! 3 $(test_oid t3) $(test_oid n3) : s/11/B/
 	    @@ Metadata
 	    Z ## Commit message ##
 	    Z    s/11/B/
@@ -337,7 +337,7 @@ test_expect_success 'renamed file' '
 	    Z 8
 	    Z 9
 	    Z 10
-	4:  $(test_oid t4) ! 4:  $(test_oid n4) s/12/B/
+	4 ! 4 $(test_oid t4) $(test_oid n4) : s/12/B/
 	    @@ Metadata
 	    Z ## Commit message ##
 	    Z    s/12/B/
@@ -356,7 +356,7 @@ test_expect_success 'renamed file' '
 test_expect_success 'file with mode only change' '
 	git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
 	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t2) ! 1:  $(test_oid o1) s/4/A/
+	1 ! 1 $(test_oid t2) $(test_oid o1) : s/4/A/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -372,7 +372,7 @@ test_expect_success 'file with mode only change' '
 	    Z 7
 	    +
 	    + ## other-file (new) ##
-	2:  $(test_oid t3) ! 2:  $(test_oid o2) s/11/B/
+	2 ! 2 $(test_oid t3) $(test_oid o2) : s/11/B/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -388,7 +388,7 @@ test_expect_success 'file with mode only change' '
 	    Z 14
 	    +
 	    + ## other-file (mode change 100644 => 100755) ##
-	3:  $(test_oid t4) = 3:  $(test_oid o3) s/12/B/
+	3 = 3 $(test_oid t4) $(test_oid o3) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -396,8 +396,8 @@ test_expect_success 'file with mode only change' '
 test_expect_success 'file added and later removed' '
 	git range-diff --no-color --submodule=log topic...added-removed >actual &&
 	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid s1) s/5/A/
-	2:  $(test_oid t2) ! 2:  $(test_oid s2) s/4/A/
+	1 = 1 $(test_oid t1) $(test_oid s1) : s/5/A/
+	2 ! 2 $(test_oid t2) $(test_oid s2) : s/4/A/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -413,7 +413,7 @@ test_expect_success 'file added and later removed' '
 	    Z 7
 	    +
 	    + ## new-file (new) ##
-	3:  $(test_oid t3) ! 3:  $(test_oid s3) s/11/B/
+	3 ! 3 $(test_oid t3) $(test_oid s3) : s/11/B/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -429,7 +429,7 @@ test_expect_success 'file added and later removed' '
 	    Z 14
 	    +
 	    + ## new-file (deleted) ##
-	4:  $(test_oid t4) = 4:  $(test_oid s4) s/12/B/
+	4 = 4 $(test_oid t4) $(test_oid s4) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -442,8 +442,8 @@ test_expect_success 'no commits on one side' '
 test_expect_success 'changed message' '
 	git range-diff --no-color topic...changed-message >actual &&
 	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid m1) s/5/A/
-	2:  $(test_oid t2) ! 2:  $(test_oid m2) s/4/A/
+	1 = 1 $(test_oid t1) $(test_oid m1) : s/5/A/
+	2 ! 2 $(test_oid t2) $(test_oid m2) : s/4/A/
 	    @@ Metadata
 	    Z ## Commit message ##
 	    Z    s/4/A/
@@ -453,16 +453,16 @@ test_expect_success 'changed message' '
 	    Z ## file ##
 	    Z@@
 	    Z 1
-	3:  $(test_oid t3) = 3:  $(test_oid m3) s/11/B/
-	4:  $(test_oid t4) = 4:  $(test_oid m4) s/12/B/
+	3 = 3 $(test_oid t3) $(test_oid m3) : s/11/B/
+	4 = 4 $(test_oid t4) $(test_oid m4) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
 
 test_expect_success 'dual-coloring' '
 	sed -e "s|^:||" >expect <<-EOF &&
-	:<YELLOW>1:  $(test_oid c1) = 1:  $(test_oid m1) s/5/A/<RESET>
-	:<RED>2:  $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2:  $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET>
+	:<YELLOW>1 = 1 $(test_oid c1) $(test_oid m1) : s/5/A/<RESET>
+	:<RED>2 ! 2 $(test_oid c2) $(test_oid m2) :<RESET><YELLOW> s/4/A/<RESET>
 	:    <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET>
 	:      ## Commit message ##<RESET>
 	:         s/4/A/<RESET>
@@ -472,7 +472,7 @@ test_expect_success 'dual-coloring' '
 	:      ## file ##<RESET>
 	:    <CYAN> @@<RESET>
 	:      1<RESET>
-	:<RED>3:  $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3:  $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET>
+	:<RED>3 ! 3 $(test_oid c3) $(test_oid m3) :<RESET><YELLOW> s/11/B/<RESET>
 	:    <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET>
 	:      9<RESET>
 	:      10<RESET>
@@ -482,7 +482,7 @@ test_expect_success 'dual-coloring' '
 	:      12<RESET>
 	:      13<RESET>
 	:      14<RESET>
-	:<RED>4:  $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4:  $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET>
+	:<RED>4 ! 4 $(test_oid c4) $(test_oid m4) :<RESET><YELLOW> s/12/B/<RESET>
 	:    <REVERSE><CYAN>@@<RESET> <RESET>file<RESET>
 	:    <CYAN> @@ file: A<RESET>
 	:      9<RESET>
@@ -506,10 +506,10 @@ do
 		test_when_finished "rm 000?-*" &&
 		test_line_count = 5 actual &&
 		test_i18ngrep "^Range-diff:$" 0000-* &&
-		grep "= 1: .* s/5/A" 0000-* &&
-		grep "= 2: .* s/4/A" 0000-* &&
-		grep "= 3: .* s/11/B" 0000-* &&
-		grep "= 4: .* s/12/B" 0000-*
+		grep "= 1 .* : s/5/A" 0000-* &&
+		grep "= 2 .* : s/4/A" 0000-* &&
+		grep "= 3 .* : s/11/B" 0000-* &&
+		grep "= 4 .* : s/12/B" 0000-*
 	'
 done
 
@@ -518,7 +518,7 @@ test_expect_success 'format-patch --range-diff as commentary' '
 	test_when_finished "rm 0001-*" &&
 	test_line_count = 1 actual &&
 	test_i18ngrep "^Range-diff:$" 0001-* &&
-	grep "> 1: .* new message" 0001-*
+	grep "> 1 .* : new message" 0001-*
 '
 
 test_expect_success 'format-patch --range-diff reroll-count with a non-integer' '
@@ -526,7 +526,7 @@ test_expect_success 'format-patch --range-diff reroll-count with a non-integer'
 	test_when_finished "rm v2.9-0001-*" &&
 	test_line_count = 1 actual &&
 	test_i18ngrep "^Range-diff:$" v2.9-0001-* &&
-	grep "> 1: .* new message" v2.9-0001-*
+	grep "> 1 .* : new message" v2.9-0001-*
 '
 
 test_expect_success 'format-patch --range-diff reroll-count with a integer' '
@@ -534,7 +534,7 @@ test_expect_success 'format-patch --range-diff reroll-count with a integer' '
 	test_when_finished "rm v2-0001-*" &&
 	test_line_count = 1 actual &&
 	test_i18ngrep "^Range-diff ..* v1:$" v2-0001-* &&
-	grep "> 1: .* new message" v2-0001-*
+	grep "> 1 .* : new message" v2-0001-*
 '
 
 test_expect_success 'format-patch --range-diff with v0' '
@@ -542,7 +542,7 @@ test_expect_success 'format-patch --range-diff with v0' '
 	test_when_finished "rm v0-0001-*" &&
 	test_line_count = 1 actual &&
 	test_i18ngrep "^Range-diff:$" v0-0001-* &&
-	grep "> 1: .* new message" v0-0001-*
+	grep "> 1 .* : new message" v0-0001-*
 '
 
 test_expect_success 'range-diff overrides diff.noprefix internally' '
@@ -566,10 +566,10 @@ test_expect_success 'range-diff compares notes by default' '
 	git range-diff --no-color main..topic main..unmodified \
 		>actual &&
 	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
-	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
+	1 = 1 $(test_oid t1) $(test_oid u1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid u2) : s/4/A/
+	3 = 3 $(test_oid t3) $(test_oid u3) : s/11/B/
+	4 ! 4 $(test_oid t4) $(test_oid u4) : s/12/B/
 	    @@ Commit message
 	    Z
 	    Z
@@ -590,10 +590,10 @@ test_expect_success 'range-diff with --no-notes' '
 	git range-diff --no-color --no-notes main..topic main..unmodified \
 		>actual &&
 	cat >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
-	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
+	1 = 1 $(test_oid t1) $(test_oid u1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid u2) : s/4/A/
+	3 = 3 $(test_oid t3) $(test_oid u3) : s/11/B/
+	4 = 4 $(test_oid t4) $(test_oid u4) : s/12/B/
 	EOF
 	test_cmp expect actual
 '
@@ -608,10 +608,10 @@ test_expect_success 'range-diff with multiple --notes' '
 	git range-diff --no-color --notes=note1 --notes=note2 main..topic main..unmodified \
 		>actual &&
 	sed s/Z/\ /g >expect <<-EOF &&
-	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
-	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
-	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
-	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
+	1 = 1 $(test_oid t1) $(test_oid u1) : s/5/A/
+	2 = 2 $(test_oid t2) $(test_oid u2) : s/4/A/
+	3 = 3 $(test_oid t3) $(test_oid u3) : s/11/B/
+	4 ! 4 $(test_oid t4) $(test_oid u4) : s/12/B/
 	    @@ Commit message
 	    Z
 	    Z
@@ -639,10 +639,10 @@ test_expect_success 'format-patch --range-diff does not compare notes by default
 	test_when_finished "rm 000?-*" &&
 	test_line_count = 5 actual &&
 	test_i18ngrep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "= 4: .* s/12/B" 0000-* &&
+	grep "= 1 .* : s/5/A" 0000-* &&
+	grep "= 2 .* : s/4/A" 0000-* &&
+	grep "= 3 .* : s/11/B" 0000-* &&
+	grep "= 4 .* : s/12/B" 0000-* &&
 	! grep "Notes" 0000-* &&
 	! grep "note" 0000-*
 '
@@ -656,10 +656,10 @@ test_expect_success 'format-patch --range-diff with --no-notes' '
 	test_when_finished "rm 000?-*" &&
 	test_line_count = 5 actual &&
 	test_i18ngrep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "= 4: .* s/12/B" 0000-* &&
+	grep "= 1 .* : s/5/A" 0000-* &&
+	grep "= 2 .* : s/4/A" 0000-* &&
+	grep "= 3 .* : s/11/B" 0000-* &&
+	grep "= 4 .* : s/12/B" 0000-* &&
 	! grep "Notes" 0000-* &&
 	! grep "note" 0000-*
 '
@@ -673,10 +673,10 @@ test_expect_success 'format-patch --range-diff with --notes' '
 	test_when_finished "rm 000?-*" &&
 	test_line_count = 5 actual &&
 	test_i18ngrep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "! 4: .* s/12/B" 0000-* &&
+	grep "= 1 .* : s/5/A" 0000-* &&
+	grep "= 2 .* : s/4/A" 0000-* &&
+	grep "= 3 .* : s/11/B" 0000-* &&
+	grep "! 4 .* : s/12/B" 0000-* &&
 	sed s/Z/\ /g >expect <<-EOF &&
 	    @@ Commit message
 	    Z
@@ -702,10 +702,10 @@ test_expect_success 'format-patch --range-diff with format.notes config' '
 	test_when_finished "rm 000?-*" &&
 	test_line_count = 5 actual &&
 	test_i18ngrep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "! 4: .* s/12/B" 0000-* &&
+	grep "= 1 .* : s/5/A" 0000-* &&
+	grep "= 2 .* : s/4/A" 0000-* &&
+	grep "= 3 .* : s/11/B" 0000-* &&
+	grep "! 4 .* : s/12/B" 0000-* &&
 	sed s/Z/\ /g >expect <<-EOF &&
 	    @@ Commit message
 	    Z
@@ -733,10 +733,10 @@ test_expect_success 'format-patch --range-diff with multiple notes' '
 	test_when_finished "rm 000?-*" &&
 	test_line_count = 5 actual &&
 	test_i18ngrep "^Range-diff:$" 0000-* &&
-	grep "= 1: .* s/5/A" 0000-* &&
-	grep "= 2: .* s/4/A" 0000-* &&
-	grep "= 3: .* s/11/B" 0000-* &&
-	grep "! 4: .* s/12/B" 0000-* &&
+	grep "= 1 .* : s/5/A" 0000-* &&
+	grep "= 2 .* : s/4/A" 0000-* &&
+	grep "= 3 .* : s/11/B" 0000-* &&
+	grep "! 4 .* : s/12/B" 0000-* &&
 	sed s/Z/\ /g >expect <<-EOF &&
 	    @@ Commit message
 	    Z
@@ -768,7 +768,7 @@ test_expect_success '--left-only/--right-only' '
 	git range-diff -s --left-only ...common >actual &&
 	head_oid=$(git rev-parse --short HEAD) &&
 	common_oid=$(git rev-parse --short common) &&
-	echo "1:  $head_oid = 2:  $common_oid common" >expect &&
+	echo "1 = 2 $head_oid $common_oid : common" >expect &&
 	test_cmp expect actual
 '
 
