mergetools / gvimdiff2on commit completion: don't disambiguate short refs (b2b6811)
   1. "$MERGE_TOOLS_DIR/vimdiff"