diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-12-25 23:37:36 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-12-25 23:37:36 -0500 |
| commit | de8837599112608feecea65a1e520866bc171569 (patch) | |
| tree | 545d25c3904664523d2196c547839731ccc6e542 /lisp/emacs-lisp | |
| parent | 5917b504874faaa849f3976e0bfd75383745bd44 (diff) | |
| download | emacs-de8837599112608feecea65a1e520866bc171569.tar.gz emacs-de8837599112608feecea65a1e520866bc171569.tar.bz2 emacs-de8837599112608feecea65a1e520866bc171569.zip | |
* admin/gitmerge.el: Tweaks that seemed necessary
* admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync".
(gitmerge-maybe-resume): Provide explicit empty commit message.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions