-
Stefan Monnier authored
* 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.
b34578dd