Added git attribute merge=union for release notes · 3222fc7943 - HarlanJI Git

Added git attribute merge=union for release notes

Adam Chainz 9 years ago

parent

2913d6b77d

commit

3222fc7943

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
.gitattributes
							 
								View File
							
				@@ -3,3 +3,4 @@
			
				 *css text eol=lf
			
				 tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
			
				 tests/staticfiles_tests/project/documents/test/*txt text eol=lf
			
				+docs/releases/*.txt merge=union