diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 15:46:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 15:46:49 -0700 |
| commit | 4fab26ba5ac381ce836eff521fc56d8d28570221 (patch) | |
| tree | efc15605a581c527b7490c5fc62dd19a31dc44ce /lisp/emacs-lisp/edebug.el | |
| parent | b08237185ec044c8afff0feb88a126512b33a6d8 (diff) | |
| download | emacs-4fab26ba5ac381ce836eff521fc56d8d28570221.tar.gz emacs-4fab26ba5ac381ce836eff521fc56d8d28570221.tar.bz2 emacs-4fab26ba5ac381ce836eff521fc56d8d28570221.zip | |
* admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
0 files changed, 0 insertions, 0 deletions