mergetools / gvimdiff2on commit Merge branch 'ab/doc-cat-file-e-still-shows-errors' (93a622f)
   1. "$MERGE_TOOLS_DIR/vimdiff"