test 3way merge conflict · c1c8a41fb1 - Gogs

test 3way merge conflict

peace 2 years ago

parent

1e96ebc513

commit

c1c8a41fb1

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
dev.txt
							 
								View File
							
				@@ -1 +1,2 @@
			
				 dev
			
				+test 3way merge with conflict change by master