diff --git a/CHANGELOG.md b/CHANGELOG.md index 98b31521..9147ab1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.15.0](https://github.com/JohnstonCode/svn-scm/compare/v2.14.0...v2.15.0) (2021-11-08) + + +### Features + +* Added Merge command ([#1540](https://github.com/JohnstonCode/svn-scm/issues/1540)) ([87060b3](https://github.com/JohnstonCode/svn-scm/commit/87060b36021361c1d99c29a91b8a22b5b1f34d09)) + # [2.14.0](https://github.com/JohnstonCode/svn-scm/compare/v2.13.6...v2.14.0) (2021-10-07) diff --git a/package.json b/package.json index cbdb2603..8b55cf46 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "svn-scm", "displayName": "SVN", "description": "Integrated Subversion source control", - "version": "2.14.0", + "version": "2.15.0", "publisher": "johnstoncode", "engines": { "vscode": "^1.44.0" @@ -249,6 +249,11 @@ "title": "Show commit messages", "category": "SVN" }, + { + "command": "svn.merge", + "title": "Merge", + "category": "SVN" + }, { "command": "svn.openChangeBase", "title": "Open Changes with BASE", @@ -456,11 +461,6 @@ "title": "Switch Branch", "category": "SVN" }, - { - "command": "svn.merge", - "title": "Merge", - "category": "SVN" - }, { "command": "svn.treeview.pullIncomingChange", "title": "Update selected", @@ -567,6 +567,10 @@ "command": "svn.log", "when": "config.svn.enabled && svnOpenRepositoryCount != 0" }, + { + "command": "svn.merge", + "when": "config.svn.enabled && svnOpenRepositoryCount != 0" + }, { "command": "svn.openChangeBase", "when": "config.svn.enabled && svnOpenRepositoryCount != 0 && svnActiveEditorHasChanges" @@ -691,10 +695,6 @@ "command": "svn.switchBranch", "when": "config.svn.enabled && svnOpenRepositoryCount != 0" }, - { - "command": "svn.merge", - "when": "config.svn.enabled && svnOpenRepositoryCount != 0" - }, { "command": "svn.treeview.pullIncomingChange", "when": "false"