diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-01 22:06:40 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-01 22:06:40 -0500 |
| commit | 0b6f4f2c6086a04b27d87d4f06b71334da3933d5 (patch) | |
| tree | ab909b893a16db55aa407c0f764c250905a9fec5 /lisp | |
| parent | 7c95819de0bb351e77449877cb6899444a99d0c1 (diff) | |
| download | emacs-0b6f4f2c6086a04b27d87d4f06b71334da3933d5.tar.gz | |
* admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)
Diffstat (limited to 'lisp')
0 files changed, 0 insertions, 0 deletions