mergetools / gvimdiff2on commit git-merge-octopus: do not capitalize "octopus" (1c67d53)
   1. "$MERGE_TOOLS_DIR/vimdiff"