diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-04-19 22:24:39 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-04-19 22:24:39 +0300 |
| commit | b5b0e0500eb6fac1b0b2e9ca4da08826225b010b (patch) | |
| tree | 4160097f23b194704a6fc7efdaceb238837ef155 /src/undo.c | |
| parent | f5076daca0c640cd53b2fb71ab693db3c83ad020 (diff) | |
| download | emacs-b5b0e0500eb6fac1b0b2e9ca4da08826225b010b.tar.gz | |
Call `smerge-start-session' even when dealing with a stash conflict
* lisp/vc/vc-git.el (vc-git-find-file-hook):
Call `smerge-start-session' even when dealing with a stash
conflict (bug#20292).
Diffstat (limited to 'src/undo.c')
0 files changed, 0 insertions, 0 deletions