mergetools / gvimdiffon commit name-rev: change a "long" variable to timestamp_t (5589e87)
   1. "$MERGE_TOOLS_DIR/vimdiff"