From 0fd309db0adbf60a99bf85fa6e5b39978b0fcc37 Mon Sep 17 00:00:00 2001
From: Kristian Andersen Hole <kristian@hole.priv.no>
Date: Mon, 25 Mar 2024 18:30:28 +0100
Subject: [PATCH] changelog

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1240ac3..ec30291 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.6.60]
+- Set --no-ext-diff when running git diff, supporting configs with other diff tools (#228). (@garymm Gary Miguel)
+- Adds `magit-branch-spinoff` command (@bezbac Ben Bachem)
+
 ## [0.6.56]
 - adds `git -c diff.noprefix=false` to raw commands (adressing #276)
 - check cursor-word chooseRef is actually a commit, otherwise throw away
diff --git a/package-lock.json b/package-lock.json
index 631214f..0585be7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "magit",
-  "version": "0.6.59",
+  "version": "0.6.60",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "magit",
-      "version": "0.6.59",
+      "version": "0.6.60",
       "license": "MIT",
       "dependencies": {
         "@vscode/iconv-lite-umd": "^0.7.0",
diff --git a/package.json b/package.json
index 37a086c..c9123a1 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "author": {
     "name": "Kristian Andersen Hole"
   },
-  "version": "0.6.59",
+  "version": "0.6.60",
   "engines": {
     "vscode": "^1.50.0"
   },