bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "

bug-gnu-emacs

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 17:13:15 +0300
User-agent:	Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0

On 05/16/2015 04:53 PM, Stefan Monnier wrote:

This is redundant.

If you switch to "(unless (or ..." you'll get rid of one "not".


These should be addressed now.

Current Thread

[Next in Thread]

bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file, (continued)