mergetools / gvimdiff3on commit add reentrant variants of sha1_to_hex and find_unique_abbrev (af49c6d)
   1. "$MERGE_TOOLS_DIR/vimdiff"