Mercurial > emacs

diff lisp/env.el @ 54903:922f49230ff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-match-conflict): Try to do something sensible for nested conflict markers. (smerge-find-conflict): Better handle errors in smerge-match-conflict.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 15 Apr 2004 20:19:11 +0000
parents 695cf19ef79e
children 6fb026ad601f 375f2633d815
line wrap: on
line diff