Files
emacs/admin/gitmerge.el
David Engster f648e48669 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'.
2016-05-01 21:17:55 +02:00

19 KiB