mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
6437a2e18e
Add a file CHANGELOG.md in the root Subsurface directory and track this file with the `-text merge=union` attribute. This prevents merge conflicts if release notes are added on top of the file by different commits. Also, make ReleaseNotes/ReleaseNotes.txt point to that file. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
8 lines
270 B
Text
8 lines
270 B
Text
.gitignore export-ignore
|
|
.gitattributes export-ignore
|
|
Documentation/*.html.git text=auto
|
|
theme/jqplot.canvasAxisTickRenderer.min.js binary
|
|
theme/jqplot.highlighter.min.js binary
|
|
theme/jquery.jqplot.min.js binary
|
|
theme/jquery.min.js binary
|
|
CHANGELOG.md -text merge=union
|