summaryrefslogtreecommitdiff
path: root/admin/bzrmerge.el
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* ‘text-quoting-style’ fixes for adminPaul Eggert2015-08-271-2/+2
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* Merge from emacs-24Stefan Monnier2013-03-161-4/+4
|\
* | * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.Paul Eggert2013-03-021-1/+1
|/
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* * admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.Glenn Morris2012-08-281-3/+10
* Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.comChong Yidong2012-08-111-1/+2
|\
| * * admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.Glenn Morris2012-08-091-1/+2
* | Merge from emacs-24Stefan Monnier2012-07-171-4/+4
|\ \ | |/
* | Reduce use of (require 'cl).Stefan Monnier2012-07-101-5/+4
* | * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".Glenn Morris2012-05-021-1/+2
* | * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".Glenn Morris2012-04-101-3/+3
|/
* Small bzrmerge.el change.Glenn Morris2012-01-181-3/+17
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* * admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.Glenn Morris2011-05-211-1/+2
* Add comments about fixing dates in merged ChangeLogs.Glenn Morris2011-02-221-0/+3
* * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.Glenn Morris2011-02-121-1/+3
* bzrmerge.el trivia.Glenn Morris2011-02-051-1/+9
* bzrmerge.el trivia.Glenn Morris2011-02-021-9/+16
* Make it easier to control which revisions bzrmerge might skip.Glenn Morris2011-01-241-2/+7
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-1/+1
* * admin/bzrmerge.el: Fix paren typo in previous.Glenn Morris2011-01-171-1/+1
* * admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be inStefan Monnier2011-01-171-0/+11
* bzrmerge.el trivia.Glenn Morris2011-01-151-2/+3
* * admin/bzrmerge.el: Require cl when compiling.Glenn Morris2011-01-131-1/+4
* * admin/bzrmerge.el: Standardize copyright and license headers.Glenn Morris2011-01-111-5/+5
* * admin/bzrmerge.el: New file to help merge branches while skippingStefan Monnier2010-12-261-0/+296