summaryrefslogtreecommitdiff
path: root/admin/bzrmerge.el
Commit message (Expand)AuthorAgeFilesLines
* * 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