diff options
-rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..437485e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +CHANGELOG merge=union + |
![]() |
index : delta/gitlab/gitlab-ci.git | |
gitlab.com: gitlab-org/gitlab-ci.git |
summaryrefslogtreecommitdiff |
-rw-r--r-- | .gitattributes | 2 |
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..437485e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +CHANGELOG merge=union + |