|
| From: | Dmitry Gutov |
| Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
| Date: | Sun, 19 Apr 2015 22:27:58 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 |
On 04/19/2015 09:38 PM, Eli Zaretskii wrote:
IMO, it's too radical: there's no need to avoid turning on smerge-mode, as it is useful for conflict resolution. "git add" is not run by smerge-mode, it is run by vc-git-resolve-when-done, so it should be enough to avoid adding that to after-save-hook, I think.
Right. That should be resolved now.
| [Prev in Thread] | Current Thread | [Next in Thread] |