[lmi-commits] [lmi] master a8e94c0b 1/6: Add a handy vim command

[Greg Chicares]

branch: master
commit a8e94c0b726251e4c5eeaaa7ee7467870e7b9112
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Add a handy vim command
    
    See:
      https://lists.nongnu.org/archive/html/lmi/2020-09/msg00083.html
---
 gwc/develop1.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index 8117f3b8..67c868d0 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -334,6 +334,10 @@ cd /opt/lmi/src/lmi
 
 /\%>80v.\+
 
+  # Find git conflict markers
+
+/^[<=>]\{7\}\( \|$\)
+
   # Change column 41 to a comma, for non-matching lines in a range
   # ('|41' seems incompatible with '|' separator, so use 'cursor')