mergetools / gvimdiffon commit Merge branch 'aw/gc-lockfile-fscanf-fix' (abdf7d8)
   1. "$MERGE_TOOLS_DIR/vimdiff"