Mercurial > emacs
diff src/fontset.h @ 112336:7e5855ddf3f2
* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
an inconsistent state.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 17 Jan 2011 16:18:00 -0500 |
parents | ef719132ddfa |
children | 42e22c4f06b7 |