mergetools / vimdiff2on commit checkout: introduce --{,no-}overlay option (091e04b)
   1. "$MERGE_TOOLS_DIR/vimdiff"