[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master e099e4c 2/2: Memorialize a handy regex for co
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master e099e4c 2/2: Memorialize a handy regex for conflict markers |
|
Date: |
Thu, 1 Oct 2020 11:11:41 -0400 (EDT) |
branch: master
commit e099e4cbc3a1cade3b7ec3ce61aca73bbb8f9862
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Memorialize a handy regex for conflict markers
---
gwc/develop1.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index 58aca8d..8a08839 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -50,6 +50,10 @@ git mv lmi.rc lmi_msw_res.rc
git commit --edit --file=.git/COMMIT_EDITMSG -- [files]
+ # Regex for conflict markers
+
+^[<=>]\{7\}\( \|$\)
+
# Make a patch against repository from local tree
git diff file0.cpp file1.cpp >some_new_file