mergetools / vimdiff3on commit git-shortlog.txt: reorder usages (a821032)
   1. "$MERGE_TOOLS_DIR/vimdiff"