Mercurial > emacs

diff ChangeLog @ 109211:d76ca4f45bff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Tue, 01 Jun 2010 11:48:01 +0000
parents bace4ba4c137
children 8fccefed04ac
line wrap: on
line diff
--- a/ChangeLog	Mon May 31 11:48:23 2010 +0000
+++ b/ChangeLog	Tue Jun 01 11:48:01 2010 +0000
@@ -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.