mergetools / gvimdiffon commit get_short_oid: sort ambiguous objects by type, then SHA-1 (5cc044e)
   1. "$MERGE_TOOLS_DIR/vimdiff"