openharmony/third_party_rust_nix
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_nix synced 2024-11-23 07:20:09 +00:00
Code Issues Actions 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 413fcabdef
commit 6182625199
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
/CHANGELOG.md merge=union