gvimdiff mergetool and enabled rerere
conceal chars now bold cyan
todo