mergetools / gvimdiff2on commit Merge branch 'jn/shell-disable-interactive' (03da85b)
   1. "$MERGE_TOOLS_DIR/vimdiff"