mergetools / gvimdiff2on commit Merge branch 'an/ignore-doc-update' (e694ea5)
   1. "$MERGE_TOOLS_DIR/vimdiff"