]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8dac9c3) | patch
* lisp/vc: Fix use of find-conflicted-file in Git.
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 1 Dec 2014 18:15:28 +0000 (13:15 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 1 Dec 2014 18:16:54 +0000 (13:16 -0500)
commitb34578dd880e788a68bb7bbd12fd848ba461226a
treeef45f477121114de64ece3eeeac7e7c72fe6b8f5tree | snapshot
parent8dac9c34d8a2575d44fc78824ec77a58b63701b6commit | diff
* 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.
lisp/ChangeLog diff | blob | history
lisp/vc/vc-git.el diff | blob | history
lisp/vc/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.