* vc-hooks.el (vc-state): Add new state `conflict'.
[bpt/emacs.git] / leim / .gitignore
1 Makefile
2 makefile
3 changed.misc
4 changed.tit
5 leim-list.el