Mercurial > emacs

annotate lib-src/testfile @ 93445:87b6e6f4a207

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-apply-resolution-patch): New fun. (smerge-resolve): Add various resolution heuristics.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 31 Mar 2008 02:57:39 +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)