diff options
| author | Paul Eggert | 2011-03-01 17:52:03 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-01 17:52:03 -0800 |
| commit | ba46f4d85a6938273f52a8cdf7e09d9afee61d7f (patch) | |
| tree | 606ec46b703532d463ccddf287f0053430eb1f4a /admin/notes | |
| parent | d9d0d182da35312ed0d7a9859b9c6a03994d86d8 (diff) | |
| parent | 0dc3e4109e0c41bbf5fdcae0ff1156162719693e (diff) | |
| download | emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.tar.gz emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.zip | |
Merge from mainline.
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/bzr | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index 14a5c92a454..db9e6e0dcda 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr | |||
| @@ -81,6 +81,8 @@ this in the same commit as making new entries. Using this plugin | |||
| 81 | will merge ALL changed entries (including older ones) to the top of | 81 | will merge ALL changed entries (including older ones) to the top of |
| 82 | the destination file. | 82 | the destination file. |
| 83 | 83 | ||
| 84 | Maybe the default Emacs behavior without this plugin is better, I dunno. | ||
| 85 | |||
| 84 | 1) Get clean, up-to-date copies of the emacs-23 and trunk branches. | 86 | 1) Get clean, up-to-date copies of the emacs-23 and trunk branches. |
| 85 | Check for any uncommitted changes with bzr status. | 87 | Check for any uncommitted changes with bzr status. |
| 86 | 88 | ||