Merge branch 'add-face-gitdiffflags' of git://github.com/schickm/kakoune

This commit is contained in:
Maxime Coste 2016-12-16 00:16:41 +00:00
commit bc67ec0779

View File

@ -20,6 +20,7 @@ decl line-flags git_blame_flags
decl line-flags git_diff_flags decl line-flags git_diff_flags
face GitBlame default,magenta face GitBlame default,magenta
face GitDiffFlags default,black
def -params 1.. \ def -params 1.. \
-docstring %sh{printf '%%{git [<arguments>]: git wrapping helper -docstring %sh{printf '%%{git [<arguments>]: git wrapping helper
@ -145,7 +146,7 @@ Available commands:\n-add\n-rm\n-blame\n-commit\n-checkout\n-diff\n-hide-blame\n
}" }"
;; ;;
show-diff) show-diff)
echo 'try %{ addhl flag_lines default,black git_diff_flags }' echo 'try %{ addhl flag_lines GitDiffFlags git_diff_flags }'
update_diff update_diff
;; ;;
update-diff) update_diff ;; update-diff) update_diff ;;