mergetools / vimdiff3on commit timestamp_t: a new data type for timestamps (dddbad7)
   1. "$MERGE_TOOLS_DIR/vimdiff"