mergetools / gvimdiff2on commit Merge branch 'jk/ls-files-doc-markup-fix' (8293ee0)
   1. "$MERGE_TOOLS_DIR/vimdiff"