diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-18 19:38:25 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-18 19:38:25 -0500 |
| commit | 1e89864f92b3e1f29592ae914cf6fccce40d49d2 (patch) | |
| tree | b00bfa77972997ce4dc862d38ef0c56f6c9f5b37 /lisp/emacs-lisp/timer.el | |
| parent | 91031a2cfd6b6a3b17c0f8724fd5cccf7c32ed5b (diff) | |
| download | emacs-1e89864f92b3e1f29592ae914cf6fccce40d49d2.tar.gz emacs-1e89864f92b3e1f29592ae914cf6fccce40d49d2.tar.bz2 emacs-1e89864f92b3e1f29592ae914cf6fccce40d49d2.zip | |
Make gitmerge usable in batch mode
* admin/gitmerge.el (gitmerge-missing): Add progress messages.
(gitmerge-maybe-resume): In batch mode, never resume.
(gitmerge): Handle batch mode.
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
0 files changed, 0 insertions, 0 deletions