|
| From: | Dmitry Gutov |
| Subject: | Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict |
| Date: | Mon, 20 Apr 2015 16:35:04 +0300 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 |
On 04/20/2015 04:14 PM, Dmitry Gutov wrote:
Hmm, it seem I can't really detect whether the file had something staged
IOW, the best indicator we have of whether to reset or not, AFAICT, is the presence of .git/MERGE_HEAD.
| [Prev in Thread] | Current Thread | [Next in Thread] |