projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7e37e61) | patch
* lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 21 Jan 2020 20:58:17 +0000 (15:58 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 21 Jan 2020 20:58:17 +0000 (15:58 -0500)
commitac09e8e1213631e2843af7e81cffa749edc5f074
tree6b414e8f6fe58953b11a35795cd70c112a18e64ftree | snapshot
parent7e37e61f4b9729ac54d80715de9dcc928e0aaf26commit | diff
* lisp/vc/smerge-mode.el (smerge-match-conflict): Fix bug#38456

This situation is not an internal error, but a perfectly normal occurrence,
so a `cl-assert` is not right
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.