Mercurial > emacs

annotate lib-src/testfile @ 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
parents 8e1b437e5d04
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25844
Dave Love <fx@gnu.org>
parents:
diff changeset
1 (binary:application/octet-stream)