|
| From: | Dmitry Gutov |
| Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
| Date: | Sat, 16 May 2015 16:15:12 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 |
On 05/16/2015 11:55 AM, Eli Zaretskii wrote:
Great, thanks.
Pushed, with some tweaks.
| [Prev in Thread] | Current Thread | [Next in Thread] |