diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-11-14 16:26:50 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-11-14 16:26:50 -0500 |
| commit | 5def69c0cdc5025b1194e8339446b6e5e528df1e (patch) | |
| tree | 6aa2ba661eb3f2e6dba59e60c6114eebd8673a77 /.gitattributes | |
| parent | 88ca587eae19afb8e069d896b95580aaed8b0e24 (diff) | |
| download | sqlalchemy-5def69c0cdc5025b1194e8339446b6e5e528df1e.tar.gz | |
- experiment with union merge for changelog
Change-Id: Ieed0199c58d7eacdb26db6e1754c1ef3ee5c8c7d
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 000000000..ffa4fc4c0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +doc/build/changelog/*.rst merge=union |