Files
emacs/lisp/vc
Stefan Monnier ac09e8e121 * 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
2020-01-21 15:58:17 -05:00
..
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00
2020-01-01 00:59:52 +00:00