(smerge-remove-props): Don't mark the buffer modified.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 8 Mar 2007 20:12:55 +0000 (20:12 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 8 Mar 2007 20:12:55 +0000 (20:12 +0000)
commit0778a62fff458712383895e429ee46242f64d553
tree97a7b7136ebd207a4cce4812fde59b54e2b7795f
parenteae7eecde067300cbc70617b41d82dbadf2e3046
(smerge-remove-props): Don't mark the buffer modified.
(debug-ignored-errors): Add entry from smerge-match-conflict.
lisp/ChangeLog
lisp/smerge-mode.el