diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-01 22:03:05 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-01 22:03:05 -0500 |
| commit | 7c95819de0bb351e77449877cb6899444a99d0c1 (patch) | |
| tree | a11b4bfab34659261e986f67f038d14032f8d452 /test/lisp/emacs-lisp/ring-tests.el | |
| parent | 52097314c1a160be622dfcf9f40c33190a90be88 (diff) | |
| download | emacs-7c95819de0bb351e77449877cb6899444a99d0c1.tar.gz emacs-7c95819de0bb351e77449877cb6899444a99d0c1.tar.bz2 emacs-7c95819de0bb351e77449877cb6899444a99d0c1.zip | |
Don't hard-code gitmerge.el's default merge branch
* admin/gitmerge.el (gitmerge-default-branch): Make it a variable,
defaulting to nil.
(gitmerge-emacs-version, gitmerge-default-branch): New functions.
(gitmerge): Guess the branch to merge from.
Diffstat (limited to 'test/lisp/emacs-lisp/ring-tests.el')
0 files changed, 0 insertions, 0 deletions