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
..
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-12-01 09:45:15 -05:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-12-01 00:28:08 -08:00
2014-11-28 23:07:16 -08:00
2014-11-17 17:58:28 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-12-01 19:14:54 +01:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-12-01 13:16:54 -05:00
2014-11-16 20:41:22 -08:00
2014-10-04 12:14:03 -07:00
2014-11-25 19:15:55 -05:00
2014-11-18 23:33:42 +02:00
2014-07-21 02:03:08 -04:00
2014-07-21 01:38:17 -04:00
2014-12-01 13:16:54 -05:00
2014-08-28 18:18:39 -04:00
2014-11-24 17:16:27 -08:00
2014-11-28 23:07:16 -08:00
2014-08-28 18:18:39 -04:00
2014-08-28 18:18:39 -04:00
2014-08-28 18:18:39 -04:00
2014-08-28 18:18:39 -04:00
2014-11-28 23:07:16 -08:00
2014-11-24 17:16:27 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-11-28 23:07:16 -08:00
2014-10-28 18:42:51 -07:00
2014-09-11 12:44:25 -07:00
2014-10-15 15:23:27 +00:00
2014-11-07 11:49:22 +01:00
2014-10-30 15:19:49 -04:00
2014-10-13 15:27:19 +03:00
2014-11-21 13:01:40 -05:00
2014-10-20 18:39:30 -04:00
2014-10-20 18:39:30 -04:00
2014-10-20 18:44:11 -04:00
2014-10-23 21:17:00 +02:00
2014-11-27 16:57:22 +01:00
2014-11-18 14:53:54 +09:00
2014-11-28 15:59:23 +09:00
2014-10-20 17:51:44 -04:00
2014-11-18 16:19:14 +09:00
2014-07-08 11:55:00 +03:00
2014-11-08 12:11:50 +01:00
2014-09-29 14:14:08 -04:00
2014-11-08 10:21:38 -08:00
2014-09-24 15:23:13 -04:00
2014-11-04 21:08:12 -08:00
2014-10-06 20:20:33 -07:00
2014-10-22 21:38:59 -04:00
2014-10-01 13:23:42 -04:00
2014-10-28 18:42:51 -07:00
2014-11-28 18:12:32 +01:00
2014-09-22 10:10:53 -04:00
2014-09-22 10:10:53 -04:00
2014-09-23 06:21:30 -04:00
2014-10-06 10:12:56 -04:00
2014-11-19 00:47:36 +00:00
2014-09-26 23:57:41 -04:00
2014-09-18 20:38:05 +02:00
2014-09-14 16:59:57 -07:00
2014-10-20 21:33:44 -04:00
2014-10-09 20:24:41 -07:00
2014-11-24 15:32:14 +02:00
2014-11-04 21:08:57 -08:00
2014-11-16 20:41:22 -08:00
2014-07-08 15:33:37 -04:00
2014-10-15 13:32:41 -04:00
2014-09-29 14:14:08 -04:00
2014-11-01 11:05:30 -07:00
2014-10-31 11:03:23 +02:00
2014-10-31 11:03:23 +02:00
2014-11-27 13:17:42 -05:00
2014-11-09 00:56:37 +02:00
2014-11-09 21:19:54 +02:00
2014-10-01 23:19:32 -04:00
2014-11-04 09:46:49 -08:00
2014-09-22 09:42:57 -04:00
2014-09-15 20:28:28 -04:00
2014-11-29 14:56:59 +01:00
2014-10-16 20:29:44 +00:00
2014-09-29 14:14:08 -04:00
2014-11-16 20:41:22 -08:00
2014-10-01 13:23:42 -04:00
2014-09-29 14:14:08 -04:00
2014-10-01 13:23:42 -04:00
2014-11-18 23:59:14 +02:00
2014-10-04 10:20:24 +02:00
2014-11-01 12:37:14 +01:00
2014-07-08 15:15:28 -04:00
2014-10-25 12:40:14 +02:00
2014-11-04 21:08:12 -08:00
2014-11-28 18:14:38 -05:00
2014-10-20 18:41:19 -04:00
2014-08-14 21:34:06 -07:00
2014-11-24 08:39:17 -08:00
2014-11-05 22:27:23 -05:00
2014-08-28 15:18:24 -04:00
2014-10-01 13:23:42 -04:00
2014-10-08 21:23:09 -07:00
2014-11-16 20:41:22 -08:00
2014-10-01 13:23:42 -04:00
2014-09-01 23:48:20 -07:00
2014-11-16 20:41:22 -08:00
2014-11-16 00:27:58 +01:00
2014-07-21 01:38:17 -04:00
2014-10-06 13:47:56 -04:00
2014-10-17 20:23:03 -04:00
2014-11-26 21:31:11 -05:00
2014-10-01 13:23:42 -04:00
2014-10-21 16:11:22 -04:00