TakeV/spacemacs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changelog.develop: List Smerge TS bindings

Browse source
This commit is contained in:
duianto 2019-04-21 11:32:02 +02:00
parent 4a8c59a146
commit 554c5cb949
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.develop
View file

@ -2209,13 +2209,19 @@ Other:
- ~SPC g v r~ to resolve conflicts in file - ~SPC g v r~ to resolve conflicts in file
- Define key bindings with leader key for vim editing style in =diff-mode= - Define key bindings with leader key for vim editing style in =diff-mode=
(thanks to miyabinomuratic) (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: - New packages:
- =browse-at-remote= which replaces =github-browse-file= - =browse-at-remote= which replaces =github-browse-file=
(thanks Eugene Yaremenko) (thanks Eugene Yaremenko)
- Avoid loading all the diff packages (thanks to Sylvain Benner) - Avoid loading all the diff packages (thanks to Sylvain Benner)
- Fixed error on =diff-hl-margin-mode= function being nil during startup (thanks - Fixed error on =diff-hl-margin-mode= function being nil during startup (thanks
to Voleking) to Voleking)
- Added smerge transient-state diff keybindings (thanks to Wang)
**** Ycmd **** Ycmd
- Search for =compile_commands.json= in build sub-directory - Search for =compile_commands.json= in build sub-directory
(thanks to Amos Bird and Eivind Fonn) (thanks to Amos Bird and Eivind Fonn)