-
David Engster authored
* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit", which is the string appended by 'git cherry-pick -x'. (cherry picked from commit f648e486)
a6e0a677
* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit", which is the string appended by 'git cherry-pick -x'. (cherry picked from commit f648e486)