Mercurial > emacs

diff admin/ChangeLog @ 112336:7e5855ddf3f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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 56d3e9c28eb0
children aee2f052ef17
line wrap: on
line diff
--- a/admin/ChangeLog	Mon Jan 17 12:17:27 2011 -0800
+++ b/admin/ChangeLog	Mon Jan 17 16:18:00 2011 -0500
@@ -1,3 +1,8 @@
+2011-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
+	an inconsistent state.
+
 2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Update copyright notes to match recent gnulib-related changes.