diff --git a/etc/soft/vim/vimrc b/etc/soft/vim/vimrc index dfaa162..7811b87 100644 --- a/etc/soft/vim/vimrc +++ b/etc/soft/vim/vimrc @@ -711,7 +711,7 @@ nmap m :MRU let MRU_File = $HOME . '/.shellrc/var/vim/mru/vim_mru_files' let MRU_Max_Entries = 150 -let MRU_Exclude_Files = '^/tmp/.*\|^/var/tmp/.*\|.*COMMIT_EDITMSG.*\|viper.*\|_cheat\|bash-fc.*' +let MRU_Exclude_Files = '^/tmp/.*\|^/var/tmp/.*\|MERGE_MSG\|.*COMMIT_EDITMSG.*\|viper.*\|_cheat\|bash-fc.*' "}}} " Quickhl {{{ @@ -881,6 +881,13 @@ imap