source: subsurface/.gitattributes

Last change on this file was 6437a2e, checked in by Dirk Hohndel <dirk@…>, 7 weeks ago

release-notes: use

Add a file 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@…>

  • Property mode set to 100644
File size: 270 bytes
1.gitignore      export-ignore
2.gitattributes  export-ignore
3Documentation/*.html.git text=auto
4theme/jqplot.canvasAxisTickRenderer.min.js binary
5theme/jqplot.highlighter.min.js binary
6theme/jquery.jqplot.min.js binary
7theme/jquery.min.js binary -text merge=union
Note: See TracBrowser for help on using the repository browser.