From 554c5cb949d6ffa23dc6af5737f8a5bd9c70956f Mon Sep 17 00:00:00 2001 From: duianto Date: Sun, 21 Apr 2019 11:32:02 +0200 Subject: [PATCH] changelog.develop: List Smerge TS bindings --- CHANGELOG.develop | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index 2d7db75d3..1fbda17d4 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -2209,13 +2209,19 @@ Other: - ~SPC g v r~ to resolve conflicts in file - Define key bindings with leader key for vim editing style in =diff-mode= (thanks to miyabinomuratic) + - Added smerge transient state diff key bindings (thanks to Wang): + ~SPC g r <~ diff base/mine + ~SPC g r =~ diff mine/other + ~SPC g r >~ diff base/other + - Added smerge transient state key bindings (thanks to duianto): + ~SPC g r e >~ ediff + ~SPC g r K >~ kill current - New packages: - =browse-at-remote= which replaces =github-browse-file= (thanks Eugene Yaremenko) - Avoid loading all the diff packages (thanks to Sylvain Benner) - Fixed error on =diff-hl-margin-mode= function being nil during startup (thanks to Voleking) -- Added smerge transient-state diff keybindings (thanks to Wang) **** Ycmd - Search for =compile_commands.json= in build sub-directory (thanks to Amos Bird and Eivind Fonn)