convert

Update newfile3.txt
Merge branch 'master' of https://bdgit.educoder.net/pah5rctm2/zjf_Gitstudy
6 changed files with 13 additions and 1 deletions
--- a/code/code1.txt
+++ b/code/code1.txt
--- a/doc/doc1.txt
+++ b/doc/doc1.txt
@ -1 +1,2 @@
 doc1.txt
 add another words
--- a/newfiel.txt
+++ b/newfiel.txt
@ -0,0 +1,5 @@
 newfile
 1111111
 222222
 444444222222
 333333
--- a/newfile2.txt
+++ b/newfile2.txt
@ -0,0 +1,4 @@
 new file2
 uuuuuuuu
 wwwwwwww
--- a/newfile3.txt
+++ b/newfile3.txt
@ -0,0 +1,3 @@
 aaaaaaaaaaaaaaa
 bbbbbbbbbaaaaaaaaaaaaaaa
 ccccccccccc
--- a/newtext2.txt
+++ b/newtext2.txt
@ -1 +0,0 @@
 new text2
Author	SHA1	Message	Date
zjf	c99ec6201a	convert	3 years ago
pah5rctm2	2ff31f8b04	Update newfile3.txt	3 years ago
zjf	cbb35cd839	Merge branch 'master' of https://bdgit.educoder.net/pah5rctm2/zjf_Gitstudy	3 years ago
zjf	76cae6e0a8	commit newfile3.txt	3 years ago
pah5rctm2	1faf6c02d2	Update newfile2.txt	3 years ago
zjf	b407382827	Merge branch 'master' of https://bdgit.educoder.net/pah5rctm2/zjf_Gitstudy # Conflicts: # newfile2.txt	3 years ago
zjf	25e6b6bba1	commit	3 years ago
pah5rctm2	53ae6021d8	Update newfile2.txt	3 years ago
pah5rctm2	dc2cd70a27	Update newfile2.txt	3 years ago
zjf	9e9f2dffad	add new file2	3 years ago
zjf	7e523ab8f2	Merge remote-tracking branch 'remotes/origin/zhangsan_branch'	3 years ago
zjf	100c190e4e	commit code/code1.txt	3 years ago
zjf	0217ebc2f3	Merge branch 'master' of https://bdgit.educoder.net/pah5rctm2/zjf_Gitstudy # Conflicts: # newfiel.txt	3 years ago
zjf	fd7976a712	add 3333333	3 years ago
pah5rctm2	abe0e536aa	add 444444	3 years ago
zjf	9d96c6b335	add 222222	3 years ago
pah5rctm2	eab1682445	add 111111	3 years ago
zjf	1386661e24	add newfile	3 years ago
zjf	313ff09b40	22222	3 years ago
pah5rctm2	813fa934a8	Update New Text Document.txt	3 years ago
zjf	b8c3a9b7af	src/hello.txt src/hello1.txt.txt	3 years ago
zjf	f26d355264	New Text Document.txt	3 years ago