|
| 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 01:06:25 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 |
On 04/19/2015 12:58 AM, Dmitry Gutov wrote:
That would mean VC behaves wit Git differently than it does with other VCSes (bzr, at least).You mean smerge-mode, not VC, right? How come? I don't even see
^^^ Sorry, please disregard this part. I can see it all right.
| [Prev in Thread] | Current Thread | [Next in Thread] |