diff options
author | David Engster <deng@randomsample.de> | 2015-11-14 17:53:10 +0100 |
---|---|---|
committer | David Engster <deng@randomsample.de> | 2015-11-14 17:54:36 +0100 |
commit | 2ac79ae901422384e8d093e079862e57c72ef2dc (patch) | |
tree | 67fde88b006c25d66425663a0f1ed05839bd0a04 /lisp/emacs-lisp/byte-run.el | |
parent | 5f7a2a90536557e3dcb3bb64d4bbbd49ea7b3fee (diff) | |
download | emacs-2ac79ae901422384e8d093e079862e57c72ef2dc.tar.gz emacs-2ac79ae901422384e8d093e079862e57c72ef2dc.tar.bz2 emacs-2ac79ae901422384e8d093e079862e57c72ef2dc.zip |
gitmerge: Try to detect cherry-picks
* admin/gitmerge.el (gitmerge-default-branch): Change to
origin/emacs-25.
(gitmerge-missing): Use symmetric difference ('...') between
branch and master so that cherry-picks can be detected.
Diffstat (limited to 'lisp/emacs-lisp/byte-run.el')
0 files changed, 0 insertions, 0 deletions