| commit | 7c95819de0bb351e77449877cb6899444a99d0c1 | |
| author | Glenn Morris <rgm@gnu.org> | |
| Sat, 2 Dec 2017 03:03:05 +0000 (1 22:03 -0500) | ||
| committer | Glenn Morris <rgm@gnu.org> | |
| Sat, 2 Dec 2017 03:03:05 +0000 (1 22:03 -0500) | ||
| tree | a11b4bfab34659261e986f67f038d14032f8d452 | treesnapshot (tar.gz zip) |
| parent | 52097314c1a160be622dfcf9f40c33190a90be88 | commitdiff |
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.
* 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.
| admin/gitmerge.el | diffblobblamehistory |