22

222
Merge branch 'main' of https://bdgit.educoder.net/p7u6w9i3q/GitTest into branch2
1 changed files with 2 additions and 1 deletions
--- a/aa.txt
+++ b/aa.txt
@ -1,3 +1,4 @@
 11
 22
-branch1
+branch1
+branch2
Author	SHA1	Message	Date
p7u6w9i3q	a20a767d3f	22 222	7 months ago
whl	e39a12d4a0	Merge branch 'main' of https://bdgit.educoder.net/p7u6w9i3q/GitTest into branch2 # Conflicts: # aa.txt	7 months ago
p7u6w9i3q	7d23181388	11 11	7 months ago
whl	7a84d6baf3	branch2 first commit	7 months ago