ssdsfsfs

dfsdf
Update doc-test.txt
2 changed files with 4 additions and 1 deletions
--- a/doc/doc-test.txt
+++ b/doc/doc-test.txt
@ -1,2 +1,3 @@
 this is a testing file in doc folder.
-in yuan-branch
+this is another branch.
+this is in main branch.
--- a/src/scr-test.txt
+++ b/src/scr-test.txt
@ -0,0 +1,2 @@
+this is a testing file in src folder.
+change something.
Author	SHA1	Message	Date
mgamqvkno	b9eda8b1c4	ssdsfsfs	1 year ago
shmily	725cd098b4	dfsdf	1 year ago
mgamqvkno	5e388e326b	Update doc-test.txt	1 year ago
mgamqvkno	1e0d6a3ed9	merge	1 year ago
shmily	2cf032a39d	Merge branch 'main' of https://bdgit.educoder.net/mgamqvkno/yuan-gittest into branch2 # Conflicts: # doc/doc-test.txt	1 year ago
mgamqvkno	1fc1bef051	Update doc-test.txt	1 year ago
shmily	8cb55e50f0	branch2	1 year ago
shmily	8231757f2d	Merge branch 'main' of https://bdgit.educoder.net/mgamqvkno/yuan-gittest into branch2 # Conflicts: # doc/doc-test.txt	1 year ago
shmily	cdbb05d928	branch2	1 year ago
mgamqvkno	6da697e7b3	Update doc-test.txt	1 year ago
mgamqvkno	bd4afff7c4	merge	1 year ago
mgamqvkno	14bbe0d0d5	Update scr-test.txt	1 year ago
shmily	27dfd61a7e	src-test	1 year ago