Skip to content
GitLab
Commit c06be6e7 authored by Ash Furrow's avatar Ash Furrow
Browse files

[Git] Adds union merge strategy.

parent 72f2f541
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
.gitattributes 0 → 100644
+ 2
− 0
View file @ c06be6e7
Changelog.md merge=union
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment