Mercurial > emacs

diff lisp/json.el @ 94626:5eb3ee73ed4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-start-session): Don't call smerge-next if looking at conflict marker.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 05 May 2008 06:16:20 +0000 (2008-05-05)
parents e670b615aad9
children ee5932bf781d
line wrap: on
line diff