[meld] vc.git: Fix a "bad" escape string
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] vc.git: Fix a "bad" escape string
- Date: Fri, 11 Jan 2019 20:56:37 +0000 (UTC)
commit 231829dc67c26290614ea07becffa6564547fa5c
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Jan 12 06:48:39 2019 +1000
vc.git: Fix a "bad" escape string
This had no effect, just placating flake8.
meld/vc/git.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index beaced8c..d388557e 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -47,8 +47,8 @@ class Vc(_vc.Vc):
NAME = "Git"
VC_DIR = ".git"
- GIT_DIFF_FILES_RE = ":(\d+) (\d+) ([a-z0-9]+) ([a-z0-9]+) ([XADMTU])\t(.*)"
- DIFF_RE = re.compile(GIT_DIFF_FILES_RE)
+ DIFF_FILES_RE = r":(\d+) (\d+) ([a-z0-9]+) ([a-z0-9]+) ([XADMTU])\t(.*)"
+ DIFF_RE = re.compile(DIFF_FILES_RE)
conflict_map = {
# These are the arguments for git-show
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]