Comparing de81eb633b...1a2e864bf0 - clone_test - Xinje

...

Author	SHA1	Message	Date
云鹏高	1a2e864bf0	更新 '冲突.txt'	1 week ago
云鹏高	708dfa2a80	no message	1 week ago

2 changed files with 3 additions and 2 deletions

Unified View

							
								+ 1
								
								- 1
							
冲突.txtView File
								
																@@ -1 +1 @@
															
																远程修改
																
																远程修改1

							
								+ 2
								
								- 1
							
重置.txtView File
								
																@@ -1 +1,2 @@
															
																1
																
																1
															
																new