mergetools / gvimdiff2on commit Merge branch 'jk/a-thread-only-dies-once' into maint (7a011aa)
   1. "$MERGE_TOOLS_DIR/vimdiff"