diff options
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 48e22c82647..8f7015e0c5f 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -800,7 +800,9 @@ This prompts for a branch to merge from." (vc-git-conflicted-files buffer-file-name) (save-excursion (goto-char (point-min)) - (re-search-forward "^<<<<<<< " nil 'noerror))) + (and (re-search-forward "^>>>>>>> " nil 'noerror) + ;; Stashes are tricky (bug#20292). + (not (looking-at "Stashed changes"))))) (vc-file-setprop buffer-file-name 'vc-state 'conflict) (smerge-start-session) (add-hook 'after-save-hook 'vc-git-resolve-when-done nil 'local) |