|
From: | Stefan Monnier |
Subject: | bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file |
Date: | Sat, 16 May 2015 09:53:12 -0400 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> If we're fine with a config var, we might as well try to support the > alternative behavior. This should do it: Looks OK to me. > + :group 'vc-git) This is redundant. > + (when (and > + (eq vc-git-resolve-conflicts 'unstage) > + ;; Doing something other than a merge. Likely applying a > + ;; stash (bug#20292). > + (not > + (file-exists-p (expand-file-name ".git/MERGE_HEAD" > + (vc-git-root > buffer-file-name)))) > + (not (vc-git-conflicted-files (vc-git-root > buffer-file-name)))) If you switch to "(unless (or ..." you'll get rid of one "not". Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |