# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1514749374 18000
# Node ID 0cf4a2458e49295a4ece473acdbcf5bce3e870cc
# Parent  807f6539d9cc8a3d879c8f9a4c7135a9c9a8dc49
add conflict marker highlight

diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf
--- a/.gnupg/gpg.conf
+++ b/.gnupg/gpg.conf
@@ -2,7 +2,6 @@ keyid-format long
 with-fingerprint
 charset utf-8
 no-greeting
-no-tty
 keyid-format 0xlong
 list-options show-uid-validity
 verify-options show-uid-validity
diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -272,6 +272,11 @@ augroup vimrc
     \   exe "normal! g`\"" |
     \ endif
 
+  " Simple highlight conflict markers
+  autocmd BufReadPost *
+    \ syn match Error "^\(<\|>\||\)\1\{6,7}" |
+    \ syn match Error "^=\{7,8}$"
+
   " double-click to edit in vimfiler
   autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file)