test git 3way merge with conflict · 1e96ebc513 - Gogs

test git 3way merge with conflict

peace 2 years ago

parent

88e863cf8e

commit

1e96ebc513

1 changed files with 3 additions and 1 deletions

Unified View Show Diff Stats

						
							+ 3
							
							- 1
						
test_git.txt
							 
								View File
							
															@@ -1,2 +1,4 @@
														
															 test git
														
															 test git
														
															-test git
														
															+test gi
														
															+test 3way merge with conflict
														
															+