Mercurial > emacs

annotate etc/yow.lines @ 65129:8303172e4c68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-remove-props): Make the args non-optional. (smerge-keep-n): Remove props. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-kill-current): Don't remove props anymore now that it's done in smerge-keep-n. (smerge-refined-change): New face. (smerge-refine-chopup-region, smerge-refine-highlight-change) (smerge-refine): New funs. (smerge-basic-map): Bind smerge-refine.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 25 Aug 2005 20:13:38 +0000
parents 4698c4b30994
children bd4ae947aab7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
44237
4698c4b30994 Fix a couple of misspellings.
Eli Zaretskii <eliz@gnu.org>
parents: 30116
diff changeset
1 (binary:application/octet-stream)