diff options
| author | David Engster <deng@randomsample.de> | 2016-05-01 21:05:18 +0200 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2016-10-06 21:39:55 -0400 |
| commit | a6e0a6770129e612398c8db98cd214586dc250f4 (patch) | |
| tree | e0c85aa3d06abc2d5e9d2769e1fa2b0748cfc7dc /src/scroll.c | |
| parent | fb12af2084a751566ff5445654d75f5653f2253d (diff) | |
| download | emacs-a6e0a6770129e612398c8db98cd214586dc250f4.tar.gz | |
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'.
(cherry picked from commit f648e4866981b142fca788372e1fd9013a0bb16a)
Diffstat (limited to 'src/scroll.c')
0 files changed, 0 insertions, 0 deletions