diff options
| author | Glenn Morris | 2011-01-24 21:10:02 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-24 21:10:02 -0800 |
| commit | d0cb866238b3a7ab811ed666d21e8bd97f6f3b41 (patch) | |
| tree | 9c14b4b9fb55fdc1f3d355aa7bdd07b30937805a /admin/ChangeLog | |
| parent | 73b0cd50031a714347109169ceb8bacae338612a (diff) | |
| download | emacs-d0cb866238b3a7ab811ed666d21e8bd97f6f3b41.tar.gz emacs-d0cb866238b3a7ab811ed666d21e8bd97f6f3b41.zip | |
Make it easier to control which revisions bzrmerge might skip.
* admin/bzrmerge.el (bzrmerge-skip-regexp): New variable.
(bzrmerge-missing): Use it.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 2337ccc879d..5ce38fdfbd5 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-01-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-skip-regexp): New variable. | ||
| 4 | (bzrmerge-missing): Use it. | ||
| 5 | |||
| 1 | 2011-01-19 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-01-19 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * make-tarball.txt: Suggest 'autoreconf -I m4 --force' | 8 | * make-tarball.txt: Suggest 'autoreconf -I m4 --force' |