diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-07-29 15:15:15 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-07-29 15:15:15 -0700 |
| commit | 55806ee46b047c03698340ce8a6397de6355c56a (patch) | |
| tree | 1b7a8d72934bf7ba5ad4b74bd173684f67511243 /lisp/emacs-lisp/byte-opt.el | |
| parent | 653a81bf8ce41725d12b20f6de3d1877d190f269 (diff) | |
| download | emacs-55806ee46b047c03698340ce8a6397de6355c56a.tar.gz emacs-55806ee46b047c03698340ce8a6397de6355c56a.tar.bz2 emacs-55806ee46b047c03698340ce8a6397de6355c56a.zip | |
* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.
Diffstat (limited to 'lisp/emacs-lisp/byte-opt.el')
0 files changed, 0 insertions, 0 deletions