mergetools / gvimdiff2on commit Merge branch 'jc/diff-format-doc' (ec8618a)
   1. "$MERGE_TOOLS_DIR/vimdiff"