mergetools / gvimdiff2on commit merge-recursive: restore accidentally dropped setting of path (481de8a)
   1. "$MERGE_TOOLS_DIR/vimdiff"