diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-12-01 13:15:28 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-12-01 13:16:54 -0500 |
| commit | b34578dd880e788a68bb7bbd12fd848ba461226a (patch) | |
| tree | ef45f477121114de64ece3eeeac7e7c72fe6b8f5 /lisp/avoid.el | |
| parent | 8dac9c34d8a2575d44fc78824ec77a58b63701b6 (diff) | |
| download | emacs-b34578dd880e788a68bb7bbd12fd848ba461226a.tar.gz emacs-b34578dd880e788a68bb7bbd12fd848ba461226a.tar.bz2 emacs-b34578dd880e788a68bb7bbd12fd848ba461226a.zip | |
* 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.
Diffstat (limited to 'lisp/avoid.el')
0 files changed, 0 insertions, 0 deletions