mergetools / gvimdiff3on commit Merge branch 'nd/stop-setenv-work-tree' (d82d093)
   1. "$MERGE_TOOLS_DIR/vimdiff"