mergetools / gvimdiff2on commit Merge branch 'ak/typofixes' (14f5630)
   1. "$MERGE_TOOLS_DIR/vimdiff"