Stefan Monnier b34578dd88 * 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.		2014-12-01 13:16:54 -05:00
..
add-log.el	* lisp/vc/add-log.el (change-log-next-buffer): Don't create an empty	2014-09-25 23:55:58 +03:00
compare-w.el	Replace "Maintainer: FSF" with the emacs-devel mailing address	2014-02-09 17:34:22 -08:00
cvs-status.el	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
diff-mode.el	* lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.	2014-12-01 13:16:53 -05:00
diff.el	Replace "Maintainer: FSF" with the emacs-devel mailing address	2014-02-09 17:34:22 -08:00
ediff-diff.el	* lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):	2014-05-02 22:27:46 -04:00
ediff-help.el	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
ediff-hook.el	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
ediff-init.el	ediff: Replace obsolete toggle-read-only with read-only-mode	2014-07-25 05:37:07 -04:00
ediff-merg.el	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
ediff-mult.el	Doc and comment fixes re "online" help	2014-06-28 19:33:50 -07:00
ediff-ptch.el	Doc and comment fixes re "online" help	2014-06-28 19:33:50 -07:00
ediff-util.el	ediff: Replace obsolete toggle-read-only with read-only-mode	2014-07-25 05:37:07 -04:00
ediff-vers.el	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
ediff-wind.el	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
ediff.el	Doc and comment fixes re "online" help	2014-06-28 19:33:50 -07:00
emerge.el	* lisp/vc/emerge.el (emerge-make-temp-file): Simplify.	2014-05-14 10:05:16 -07:00
log-edit.el	Tweak previous log-edit-changelog-entries change	2014-07-10 14:09:04 -04:00
log-view.el	Explain recent change to log-view.el	2014-01-06 22:00:16 -08:00
pcvs-defs.el	lisp/vc/pcvs*.el: Fix typos.	2014-03-12 05:00:03 +01:00
pcvs-info.el	lisp/vc/pcvs*.el: Fix typos.	2014-03-12 05:00:03 +01:00
pcvs-parse.el	lisp/vc/pcvs*.el: Fix typos.	2014-03-12 05:00:03 +01:00
pcvs-util.el	lisp/vc/pcvs*.el: Fix typos.	2014-03-12 05:00:03 +01:00
pcvs.el	lisp/vc/pcvs*.el: Fix typos.	2014-03-12 05:00:03 +01:00
smerge-mode.el	* lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.	2014-12-01 13:16:53 -05:00
vc-annotate.el	Simplify use of current-time and friends.	2014-10-28 18:42:51 -07:00
vc-arch.el	API simplification: remove vc-workfile-unchanged-p from pubic methods.	2014-12-01 08:24:27 -05:00
vc-bzr.el	Remove vc-state-heuristic from the set of public methods.	2014-12-01 09:41:54 -05:00
vc-cvs.el	Refactor VC merging to fix a layer violation.	2014-12-01 11:43:10 -05:00
vc-dav.el	Test checkin to attempt to tickle a bug reported on the dev list.	2014-12-01 12:06:19 -05:00
vc-dir.el	Fix bug#18964	2014-11-10 03:29:58 +02:00
vc-dispatcher.el	Stop vc from burying buffers sometimes	2014-10-21 17:05:13 +01:00
vc-filewise.el	Renove duplicate code.	2014-12-01 07:39:15 -05:00
vc-git.el	* lisp/vc: Fix use of find-conflicted-file in Git.	2014-12-01 13:16:54 -05:00
vc-hg.el	Update some documentation changes and todo items.	2014-12-01 10:57:09 -05:00
vc-hooks.el	Confine vc-stay-local to CVS, because it was unusable in SVN.	2014-12-01 10:11:42 -05:00
vc-mtn.el	API simplification: remove vc-workfile-unchanged-p from pubic methods.	2014-12-01 08:24:27 -05:00
vc-rcs.el	Refactor VC merging to fix a layer violation.	2014-12-01 11:43:10 -05:00
vc-sccs.el	The vc-mistrust-permissions configuration variable is gone.	2014-12-01 09:08:26 -05:00
vc-src.el	Update some documentation changes and todo items.	2014-12-01 10:57:09 -05:00
vc-svn.el	Refactor VC merging to fix a layer violation.	2014-12-01 11:43:10 -05:00
vc.el	* lisp/vc: Fix use of find-conflicted-file in Git.	2014-12-01 13:16:54 -05:00