·
168 commits
to master
since this release
Release with a single bugfix.
Bugfixes
- Fix false positive conflict in line-based merge on pure addition (#145)
- This mostly affected additions of file headers