diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-06-11 20:41:07 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-06-18 20:02:04 -0400 |
| commit | 5498acb5a2b4a19060d17c0e2ce0aec36ee684f9 (patch) | |
| tree | 85eb75e45e6b6a830366c498d7a23c6bd2cac6cd /lisp/elec-pair.el | |
| parent | 91ebbbfa107c60db84e09d54d952ffd969821ccb (diff) | |
| download | emacs-5498acb5a2b4a19060d17c0e2ce0aec36ee684f9.tar.gz emacs-5498acb5a2b4a19060d17c0e2ce0aec36ee684f9.tar.bz2 emacs-5498acb5a2b4a19060d17c0e2ce0aec36ee684f9.zip | |
Stop assuming .git is a directory in gitmerge.el
* admin/gitmerge.el (gitmerge-maybe-resume): Use 'git rev-parse
--git-dir' to find the git directory rather than assuming it is
.git/ (that assumption fails for separated worktrees).
Diffstat (limited to 'lisp/elec-pair.el')
0 files changed, 0 insertions, 0 deletions