| commit | de8837599112608feecea65a1e520866bc171569 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Sat, 26 Dec 2015 04:37:36 +0000 (25 23:37 -0500) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Sat, 26 Dec 2015 04:37:36 +0000 (25 23:37 -0500) | ||
| tree | 545d25c3904664523d2196c547839731ccc6e542 | treesnapshot (tar.gz zip) |
| parent | 5917b504874faaa849f3976e0bfd75383745bd44 | commitdiff |
* admin/gitmerge.el: Tweaks that seemed necessary
* admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync".
(gitmerge-maybe-resume): Provide explicit empty commit message.
* admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync".
(gitmerge-maybe-resume): Provide explicit empty commit message.
| admin/gitmerge.el | diffblobblamehistory |