Sun, 31 Dec 2017 14:42:54 -0500
add conflict marker highlight
script_line1 = use strict; use warnings; use v5.14; use experimentals; script_line2 = require('~/.replyrc.local.pl') if -e '~/.replyrc.local.pl'; (); [Colors] [DataPrinter] [FancyPrompt] [Interrupt] [Hints] [Packages] [LexicalPersistence] [ResultCache] [LoadClass] [ReadLine] [Editor] [Autocomplete::Packages] [Autocomplete::Lexicals] [Autocomplete::Functions] [Autocomplete::Globals] [Autocomplete::Methods] [Autocomplete::Commands] [Autocomplete::Keywords] [Timer] mintime = 1.0 [CollapseStack] num_lines = 3