mergetools / gvimdiffon commit git-compat-util: st_add4: work around gcc 4.2.x compiler crash (d616fbf)
   1. "$MERGE_TOOLS_DIR/vimdiff"