mergetools / gvimdiff2on commit log_ref_setup(): improve robustness against races (1fb0c80)
   1. "$MERGE_TOOLS_DIR/vimdiff"