diff options
| author | Sviatoslav Sydorenko <wk@sydorenko.org.ua> | 2018-06-18 14:44:34 +0200 |
|---|---|---|
| committer | Sviatoslav Sydorenko <wk@sydorenko.org.ua> | 2018-06-18 14:44:34 +0200 |
| commit | 9c4cd4b048a4cc613c079e5db29e9d3c3803a1f0 (patch) | |
| tree | 0d74668115cf6cbe3c07e9f68bef634e3668e3f3 /.gitattributes | |
| parent | 990d782a758a43bebcfdd9bffaad05607993691c (diff) | |
| download | cherrypy-git-9c4cd4b048a4cc613c079e5db29e9d3c3803a1f0.tar.gz | |
Set union merge strategy for changelog
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..00e5815f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/CHANGES.rst merge=union |