mergetools / gvimdiff2on commit Merge branch 'es/contacts-blame-L-multi' (3b30ba5)
   1. "$MERGE_TOOLS_DIR/vimdiff"