Mercurial > emacs
comparison lisp/ediff.el @ 76397:e9b063d17531
(smerge-remove-props): Don't mark the buffer modified.
(debug-ignored-errors): Add entry from smerge-match-conflict.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 08 Mar 2007 20:12:55 +0000 |
| parents | 11ae87f329da |
| children | 9355f9b7bbff dbd9a7dfa004 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
| 76396:b63d1410b51c | 76397:e9b063d17531 |
|---|