|
| 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 21:30:30 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 |
On 04/19/2015 09:25 PM, Eli Zaretskii wrote:
If we can, yes. If not, this is way out of scope of the bug report.
Do you like the solution in d35f2f482273a822df695202f4a3bf1a5e473e63?
| [Prev in Thread] | Current Thread | [Next in Thread] |