Commit 53dab179 authored by Sam Steingold's avatar Sam Steingold
Browse files

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

parent 417f77e6
2009-08-14 Sam Steingold <sds@gnu.org>
* vc-cvs.el (vc-cvs-merge-news): Yet annother fix of message parsing.
2009-08-13 Chong Yidong <cyd@stupidchicken.com>
* faces.el (help-argument-name): Define it here instead of
......
......@@ -458,7 +458,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
(if (re-search-forward
(concat "^\\([CMUP] \\)?"
(regexp-quote
(substring file (length default-directory)))
(substring file (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