| commit | 597ede7e5b3c965f1653d15c964e86ccb989a62f | |
| author | Glenn Morris <rgm@gnu.org> | |
| Mon, 15 Jan 2018 20:28:50 +0000 (15 12:28 -0800) | ||
| committer | Glenn Morris <rgm@gnu.org> | |
| Mon, 15 Jan 2018 20:29:28 +0000 (15 12:29 -0800) | ||
| tree | 53ce5185be7978fdf9cdaefa8a685f4f0ece9d82 | treesnapshot (tar.gz zip) |
| parent | 72ee93d68daea00e2ee69417afd4e31b3145a9fa | commitdiff |
Small gitmerge-skip-regexp fix
* admin/gitmerge.el (gitmerge-skip-regexp): Update for new format
of "bump version" message that seems to have appeared.
* admin/gitmerge.el (gitmerge-skip-regexp): Update for new format
of "bump version" message that seems to have appeared.
| admin/gitmerge.el | diffblobblamehistory |