mergetools / gvimdiffon commit Merge branch 'rs/fix-unlink-unix-socket' (6da748a)
   1. "$MERGE_TOOLS_DIR/vimdiff"