diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-17 16:18:00 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-17 16:18:00 -0500 |
| commit | 41f44310b35b8246475d707b3417e42a03b1ca05 (patch) | |
| tree | 45eb63415cc44032cc52d572ca2a553c451a8d84 /lisp/files.el | |
| parent | 61f74651c4d5d7502069263ce763cb8685b81ad8 (diff) | |
| download | emacs-41f44310b35b8246475d707b3417e42a03b1ca05.tar.gz emacs-41f44310b35b8246475d707b3417e42a03b1ca05.tar.bz2 emacs-41f44310b35b8246475d707b3417e42a03b1ca05.zip | |
* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
an inconsistent state.
Diffstat (limited to 'lisp/files.el')
0 files changed, 0 insertions, 0 deletions