| commit | b34578dd880e788a68bb7bbd12fd848ba461226a | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 1 Dec 2014 18:15:28 +0000 (1 13:15 -0500) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 1 Dec 2014 18:16:54 +0000 (1 13:16 -0500) | ||
| tree | ef45f477121114de64ece3eeeac7e7c72fe6b8f5 | treesnapshot (tar.gz zip) |
| parent | 8dac9c34d8a2575d44fc78824ec77a58b63701b6 | commitdiff |
* 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/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 | diffblobblamehistory | |
| lisp/vc/vc-git.el | diffblobblamehistory | |
| lisp/vc/vc.el | diffblobblamehistory |