index
:
packy/emacs
master
Unnamed repository; edit this file 'description' to name the repository.
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
admin
/
bzrmerge.el
Age
Commit message (
Expand
)
Author
2013-03-16
Merge from emacs-24
Stefan Monnier
2013-03-02
* bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.
Paul Eggert
2013-01-01
Update copyright notices for 2013.
Paul Eggert
2012-08-28
* admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.
Glenn Morris
2012-08-11
Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com
Chong Yidong
2012-08-09
* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.
Glenn Morris
2012-07-17
Merge from emacs-24
Stefan Monnier
2012-07-10
Reduce use of (require 'cl).
Stefan Monnier
2012-05-02
* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".
Glenn Morris
2012-04-10
* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
Glenn Morris
2012-01-18
Small bzrmerge.el change.
Glenn Morris
2012-01-05
Add 2012 to FSF copyright years for Emacs files
Glenn Morris
2011-05-21
* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
Glenn Morris
2011-02-22
Add comments about fixing dates in merged ChangeLogs.
Glenn Morris
2011-02-12
* admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
Glenn Morris
2011-02-05
bzrmerge.el trivia.
Glenn Morris
2011-02-02
bzrmerge.el trivia.
Glenn Morris
2011-01-24
Make it easier to control which revisions bzrmerge might skip.
Glenn Morris
2011-01-24
Convert consecutive FSF copyright years to ranges.
Glenn Morris
2011-01-17
* admin/bzrmerge.el: Fix paren typo in previous.
Glenn Morris
2011-01-17
* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
Stefan Monnier
2011-01-15
bzrmerge.el trivia.
Glenn Morris
2011-01-13
* admin/bzrmerge.el: Require cl when compiling.
Glenn Morris
2011-01-11
* admin/bzrmerge.el: Standardize copyright and license headers.
Glenn Morris
2010-12-26
* admin/bzrmerge.el: New file to help merge branches while skipping
Stefan Monnier