From: Jens Hoepken <jhoepken@gmail.com>
Date: Tue, 19 Mar 2013 12:58:38 +0000 (+0100)
Subject: Resolve merge conflict
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/26cfc8ef05385a8b5f526c4d461d982a82b119b2?hp=--cc

Resolve merge conflict
---

26cfc8ef05385a8b5f526c4d461d982a82b119b2
diff --cc syntax/mkd.vim
index eda1acf,ce01867..20b1d3a
--- a/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@@ -59,21 -62,21 +62,22 @@@ syn region mkdLinkTitle matchgroup=mkdD
  
  "define Markdown groups
  syn match  mkdLineContinue ".$" contained
- syn match  mkdRule      /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
- syn match  mkdRule      /^\s*-\s\{0,1}-\s\{0,1}-$/
- syn match  mkdRule      /^\s*_\s\{0,1}_\s\{0,1}_$/
- syn match  mkdRule      /^\s*-\{3,}$/
- syn match  mkdRule      /^\s*\*\{3,5}$/
- syn match  mkdListItem  "^\s*[-*+]\s\+"
- syn match  mkdListItem  "^\s*\d\+\.\s\+"
- syn match  mkdCode      /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
- syn match  mkdLineBreak /  \+$/
- syn region mkdFootnote  start="\[^"      end="\]"
- syn region mkdCode      start=/\\\@<!`/                   end=/\\\@<!`/
- syn region mkdCode      start=/\s*``[^`]*/          end=/[^`]*``\s*/
- syn region mkdBlockquote start=/^\s*>/              end=/$/                 contains=mkdLineBreak,mkdLineContinue,@Spell
- syn region mkdCode      start="<pre[^>]*>"         end="</pre>"
- syn region mkdCode      start="<code[^>]*>"        end="</code>"
+ syn match  mkdLineBreak    /  \+$/
+ syn region mkdBlockquote   start=/^\s*>/                   end=/$/ contains=mkdLineBreak,mkdLineContinue,@Spell
+ syn region mkdCode         start=/\(\([^\\]\|^\)\\\)\@<!`/ end=/\(\([^\\]\|^\)\\\)\@<!`/
+ syn region mkdCode         start=/\s*``[^`]*/              end=/[^`]*``\s*/
+ syn region mkdCode         start=/^```\s*\w*\s*$/          end=/^```\s*$/
+ syn region mkdCode         start="<pre[^>]*>"              end="</pre>"
+ syn region mkdCode         start="<code[^>]*>"             end="</code>"
++syn region mkdFootnote     start="\[^"                     end="\]"
+ syn match  mkdCode         /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
+ syn match  mkdListItem     "^\s*[-*+]\s\+"
+ syn match  mkdListItem     "^\s*\d\+\.\s\+"
+ syn match  mkdRule         /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
+ syn match  mkdRule         /^\s*-\s\{0,1}-\s\{0,1}-$/
+ syn match  mkdRule         /^\s*_\s\{0,1}_\s\{0,1}_$/
+ syn match  mkdRule         /^\s*-\{3,}$/
+ syn match  mkdRule         /^\s*\*\{3,5}$/
  
  "HTML headings
  syn region htmlH1       start="^\s*#"                   end="\($\|#\+\)" contains=@Spell