diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-12-10 12:42:17 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-12-10 12:42:17 -0500 |
| commit | 874f69acecf0c6c3c4886375c092fb389d207241 (patch) | |
| tree | f7f10307b0ac312fab06c370cf9377dd426a9c35 /test/lisp/emacs-lisp | |
| parent | edd0c241162ed7242767c16a3737d84be336d4f9 (diff) | |
| download | emacs-874f69acecf0c6c3c4886375c092fb389d207241.tar.gz emacs-874f69acecf0c6c3c4886375c092fb389d207241.tar.bz2 emacs-874f69acecf0c6c3c4886375c092fb389d207241.zip | |
* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.
Diffstat (limited to 'test/lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions