mergetools / vimdiff3on commit completion: add and use --list-cmds=alias (3301d36)
   1. "$MERGE_TOOLS_DIR/vimdiff"