[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el,v |
Date: |
Tue, 12 Jun 2007 21:18:48 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 07/06/12 21:18:48
Index: ediff-ptch.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-ptch.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- ediff-ptch.el 12 Jun 2007 19:20:24 -0000 1.33
+++ ediff-ptch.el 12 Jun 2007 21:18:46 -0000 1.34
@@ -139,7 +139,7 @@
"^\\*\\*\\* \\([^\t]+\\)[^*]+[\t ]*\n--- \\([^\t]+\\)"
"\\|" ; GNU unified format diff 2-liner
"^--- \\([^\t]+\\)[\t ]+.*\n\\+\\+\\+ \\([^\t]+\\)"
- "\\)"))
+ "\\)")
"*Regexp matching filename 2-liners at the start of each context diff.
You probably don't want to change that, unless you are using an obscure patch
program."