openharmony/third_party_rust_nix
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_rust_nix.git synced 2026-06-30 21:27:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

use better merge algorithm for CHANGELOG.md

Browse Source 
see also: https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
This commit is contained in:
Jörg Thalheim
2017-09-04 10:34:52 +01:00
parent c0f17d131b
commit af17007f8d
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+1
View File
@@ -0,0 +1 @@
/CHANGELOG.md merge=union