diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-01-30 21:43:28 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-01-30 21:43:28 -0500 |
| commit | 843f3d4f34c2f54fac19d97c32399671f98ccc51 (patch) | |
| tree | aa000aeac8e88a7d92b281735d3eed5f1ee79258 /lisp/emacs-lisp | |
| parent | 2b0bcbbaa64f95c14deed89fdf279d8be48ee352 (diff) | |
| download | emacs-843f3d4f34c2f54fac19d97c32399671f98ccc51.tar.gz emacs-843f3d4f34c2f54fac19d97c32399671f98ccc51.tar.bz2 emacs-843f3d4f34c2f54fac19d97c32399671f98ccc51.zip | |
automerge: handle upstream changes during operation
* admin/automerge (merge): New function, split from pre-existing code.
(main): If upstream changed during building and testing,
reset local and try merging again.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions