diff options
| author | David Engster <deng@randomsample.de> | 2016-05-01 21:05:18 +0200 |
|---|---|---|
| committer | David Engster <deng@randomsample.de> | 2016-05-01 21:17:55 +0200 |
| commit | f648e4866981b142fca788372e1fd9013a0bb16a (patch) | |
| tree | c1a0c01b1ee806a6d8802fd306bb76a83c59369f /lisp/emacs-lisp/macroexp.el | |
| parent | 5942c18e9a4f04996d80071b717049f55c1f69d8 (diff) | |
| download | emacs-f648e4866981b142fca788372e1fd9013a0bb16a.tar.gz emacs-f648e4866981b142fca788372e1fd9013a0bb16a.tar.bz2 emacs-f648e4866981b142fca788372e1fd9013a0bb16a.zip | |
gitmerge: Add cherry pick to gitmerge-skip-regexp
* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit",
which is the string appended by 'git cherry-pick -x'.
Diffstat (limited to 'lisp/emacs-lisp/macroexp.el')
0 files changed, 0 insertions, 0 deletions