diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 10:52:54 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 10:52:54 -0700 |
| commit | 6bd1e2203486ace170f5de15cf7d66146fc8cc87 (patch) | |
| tree | f497a0c2de375231af1ce1423ba2e6d35d90e48e /lisp/gnus/mml-sec.el | |
| parent | 780a605e1d2de4b975e6f1f29b491c9af419dcff (diff) | |
| download | emacs-6bd1e2203486ace170f5de15cf7d66146fc8cc87.tar.gz emacs-6bd1e2203486ace170f5de15cf7d66146fc8cc87.tar.bz2 emacs-6bd1e2203486ace170f5de15cf7d66146fc8cc87.zip | |
Keep "merge" commits by default in gitmerge
* admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
causes false positives. See:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html
Diffstat (limited to 'lisp/gnus/mml-sec.el')
0 files changed, 0 insertions, 0 deletions