Mercurial > emacs

diff ChangeLog @ 108840:bace4ba4c137

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 31 May 2010 22:34:49 -0400
parents b3e4bcfa7d8b c42233dee7f6
children 8fccefed04ac
line wrap: on
line diff
--- a/ChangeLog	Mon May 31 21:49:15 2010 -0400
+++ b/ChangeLog	Mon May 31 22:34:49 2010 -0400
@@ -1,3 +1,8 @@
+2010-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* .bzrignore: Ignore new files from trunk, which appear if you use
+	colocated branches (i.e. "bzr switch").
+
 2010-05-28  Glenn Morris  <rgm@gnu.org>
 
 	* configure.in: Simplify some of the $canonical tests.