Commit ff6b00de authored by Sam Steingold's avatar Sam Steingold
Browse files

(vc-cvs-merge-news): Yet another fix of message parsing.

parent fe8c0b47
2010-02-18 Sam Steingold <sds@gnu.org>
* vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing.
2010-02-18 Stefan Monnier <monnier@iro.umontreal.ca>
Use abbreviated file names in bookmarks (bug#5591).
......
......@@ -459,8 +459,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
(if (re-search-forward
(concat "^\\([CMUP] \\)?"
(regexp-quote
(substring file (length (expand-file-name
"." default-directory))))
(substring file (1+ (length (expand-file-name
"." default-directory)))))
"\\( already contains the differences between \\)?")
nil t)
(cond
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment