Author Archives

Vim::X – VimL is Eldritch, Let’s Write Perl!

Last week, I finally got around writing a few macros to help with conflict resolution in Vim: ” conflict resolution – pick this one / option 1 / option 2 map ,. $?\v^[<=]{7}jy/\v^[=>]{7}?\v^[<]{7}”_d/\v^\>{7}”_ddP map ,< $?\v^[<]{7}<,>. map ,> $?\v^[<]{7}/\v^[=]{7}<,>. ” … or keep’em both map ,m $?\v^[<]{7}”_dd/\v[=]{7}cc/\v[>]{7}”_dd With that, I can go from conflict to…