| commit | b5b0e0500eb6fac1b0b2e9ca4da08826225b010b | |
| author | Dmitry Gutov <dgutov@yandex.ru> | |
| Sun, 19 Apr 2015 19:24:39 +0000 (19 22:24 +0300) | ||
| committer | Dmitry Gutov <dgutov@yandex.ru> | |
| Sun, 19 Apr 2015 19:24:39 +0000 (19 22:24 +0300) | ||
| tree | 4160097f23b194704a6fc7efdaceb238837ef155 | treesnapshot (tar.gz zip) |
| parent | f5076daca0c640cd53b2fb71ab693db3c83ad020 | commitdiff |
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).
* lisp/vc/vc-git.el (vc-git-find-file-hook):
Call `smerge-start-session' even when dealing with a stash
conflict (bug#20292).
| lisp/vc/vc-git.el | diffblobblamehistory |