mergetools / gvimdiffon commit Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' (3dc0170)
   1. "$MERGE_TOOLS_DIR/vimdiff"