fix conflict marker hl

pluck just a few things from omz common-aliases

(0) -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 tip

mercurial