This repository has been archived on 2024-10-22. You can view files and clone it, but cannot push or open issues or pull requests.

Miciah Masters ec0a535b27 Show conflicts in smerge ts hint ... Use a dynamic hint for the smerge transient state in order to show the current and total numbers of conflicts, and make the full hint toggleable. * CHANGELOG.develop: Add an entry for this change. * layers/+source-control/version-control/config.el (spacemacs--smerge-ts-full-hint-toggle): New variable. * layers/+source-control/version-control/funcs.el (spacemacs//smerge-ts-hint): New function. Return a string indicating the index of the current conflict and the total number of conflicts detected by smerge-mode. If spacemacs--smerge-ts-full-hint-toggle is true, append the smerge transient state's full hint. (spacemacs//smerge-ts-toggle-hint): Toggle showing the full hint for the smerge transient state. * layers/+source-control/version-control/packages.el (version-control/init-smerge-mode): Define the transient state in :init so we can use spacemacs|transient-state-format-hint. Use spacemacs//smerge-ts-hint to display a dynamic hint. Bind the ? key to spacemacs//smerge-ts-toggle-hint.		2019-10-13 10:09:42 +02:00
..
git	Add spacemacs/git-permalink functionality	2019-10-05 19:19:41 +02:00
github	[core] Fix layer dependencies based on layer variables	2019-09-30 02:00:48 -04:00
perforce	[doc] Fix typos and add missing/remove extra ~	2019-06-01 20:40:22 +02:00
version-control	Show conflicts in smerge ts hint	2019-10-13 10:09:42 +02:00