mergetools / gvimdiff3on commit alias: use the early config machinery to expand aliases (a9bcf65)
   1. "$MERGE_TOOLS_DIR/vimdiff"