mergetools / gvimdiff2on commit Merge branch 'jc/drop-git-spec-in' (54b0ac5)
   1. "$MERGE_TOOLS_DIR/vimdiff"