mergetools / gvimdiff2on commit mergetools: simplify how we handle "vim" and "defaults" (073678b)
   1. "$MERGE_TOOLS_DIR/vimdiff"