Mercurial > emacs

comparison 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
comparison
equal deleted inserted replaced
112335:d3c691ea0839 112336:7e5855ddf3f2
1 2011-01-17 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
4 an inconsistent state.
5
1 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> 6 2011-01-17 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Update copyright notes to match recent gnulib-related changes. 8 Update copyright notes to match recent gnulib-related changes.
4 * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in, 9 * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
5 arg-nonnull.h, c++defs.h, compile, depcomp, missing, 10 arg-nonnull.h, c++defs.h, compile, depcomp, missing,