Commit b34578dd authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/vc: Fix use of find-conflicted-file in Git.

* lisp/vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the
current "project" rather than just the current directory.
* lisp/vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory
the file names make sense.
parent 8dac9c34
2014-12-01 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the
current "project" rather than just the current directory.
* vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory
the file names make sense.
* vc/smerge-mode.el (smerge-swap): New command.
* vc/diff-mode.el (diff-kill-applied-hunks): New command.
......
......@@ -777,7 +777,7 @@ This prompts for a branch to merge from."
;; See git-status(1).
(when (member state '("AU" "UD" "UA" ;; "DD"
"DU" "AA" "UU"))
(push file files)))))))
(push (expand-file-name file directory) files)))))))
(defun vc-git-resolve-when-done ()
"Call \"git add\" if the conflict markers have been removed."
......
......@@ -2101,8 +2101,9 @@ changes from the current branch."
(let* ((backend (or (if buffer-file-name (vc-backend buffer-file-name))
(vc-responsible-backend default-directory)
(error "No VC backend")))
(root (vc-root-dir))
(files (vc-call-backend backend
'conflicted-files default-directory)))
'conflicted-files (or root default-directory))))
;; Don't try and visit the current file.
(if (equal (car files) buffer-file-name) (pop files))
(if (null files)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment