]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f7b9b9a) | patch
Also highlight 'conflict' with the warning face
authorDmitry Gutov <dgutov@yandex.ru>
Sat, 30 Jan 2021 13:42:19 +0000 (15:42 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Sat, 30 Jan 2021 13:42:19 +0000 (15:42 +0200)
commit96f20120c97a0a329fff81a0cc3747082a8a2c55
treeebb51179bb47e9ee0719409213288dc4ccf9a2d8tree | snapshot
parentf7b9b9a85e40555a23ee56d75338a3c4e378e4f5commit | diff
Also highlight 'conflict' with the warning face

* lisp/vc/vc-git.el (vc-git-dir-printer):
Also highlight 'conflict' with the warning face, like
vc-default-dir-printer does already.
lisp/vc/vc-git.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.