Mercurial > emacs

annotate leim/.cvsignore @ 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 e1a4e53fbef0
children adbf7c56937f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
55614
e1a4e53fbef0 Added entries to .cvsignore files.
John Wiegley <johnw@newartisans.com>
parents: 31816
diff changeset
1 Makefile
e1a4e53fbef0 Added entries to .cvsignore files.
John Wiegley <johnw@newartisans.com>
parents: 31816
diff changeset
2 changed.misc
e1a4e53fbef0 Added entries to .cvsignore files.
John Wiegley <johnw@newartisans.com>
parents: 31816
diff changeset
3 changed.tit
31482
f3172f34a550 ignore autogenerated leim-list.el
Sam Steingold <sds@gnu.org>
parents:
diff changeset
4 leim-list.el