877176e0b0
Remove one of the last remaining uses of
"TEST_GIT_DEFAULT_INITIAL_BRANCH= main" in the test suite. We have
been steadily be converting tests from using "master" as the default
branch name since the introduction of TEST_GIT_DEFAULT_INITIAL_BRANCH
in 704fed9ea2 (tests: start moving to a different default main branch
name, 2020-10-23) The changes here are purely mechanical replacing
"master" with "main"
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
30 lines
291 B
Plaintext
30 lines
291 B
Plaintext
$ git diff main main^ side
|
|
diff --cc dir/sub
|
|
index cead32e,7289e35..992913c
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@@ -1,6 -1,4 +1,8 @@@
|
|
A
|
|
B
|
|
+C
|
|
+D
|
|
+E
|
|
+F
|
|
+ 1
|
|
+ 2
|
|
diff --cc file0
|
|
index b414108,f4615da..10a8a9f
|
|
--- a/file0
|
|
+++ b/file0
|
|
@@@ -1,6 -1,6 +1,9 @@@
|
|
1
|
|
2
|
|
3
|
|
+4
|
|
+5
|
|
+6
|
|
+ A
|
|
+ B
|
|
+ C
|
|
$
|