Bump changelog (#1657)

award999 · web-flow · commit 43c2cca32abf · 2025-06-26T12:47:41.000-04:00
* Bump changelog

Finalize for 2.6 release and start new entry

* Try a union merge strategy

Hoping less conflicts in the changelog
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md -text merge=union
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## {{releaseVersion}} - {{releaseDate}}
 
+### Fixed
+
+- Cleanup Swift diagnostics when the source file is moved or deleted ([#1653](https://github.com/swiftlang/vscode-swift/pull/1653))
+
+## 2.6.0 - 2025-06-26
+
 ### Added
 
 - Support for [multi-root .code-workspace](https://code.visualstudio.com/docs/editing/workspaces/multi-root-workspaces) workspaces ([#1566](https://github.com/swiftlang/vscode-swift/pull/1566))
