Mercurial > emacs
diff etc/ChangeLog @ 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 | 41f5a96a1e35 |
children | 67bea318ed68 |