diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2020-01-21 15:58:17 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2020-01-21 15:58:17 -0500 |
| commit | ac09e8e1213631e2843af7e81cffa749edc5f074 (patch) | |
| tree | 6b414e8f6fe58953b11a35795cd70c112a18e64f /lisp/emacs-lisp/generator.el | |
| parent | 7e37e61f4b9729ac54d80715de9dcc928e0aaf26 (diff) | |
| download | emacs-ac09e8e1213631e2843af7e81cffa749edc5f074.tar.gz emacs-ac09e8e1213631e2843af7e81cffa749edc5f074.tar.bz2 emacs-ac09e8e1213631e2843af7e81cffa749edc5f074.zip | |
* 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
Diffstat (limited to 'lisp/emacs-lisp/generator.el')
0 files changed, 0 insertions, 0 deletions