mergetools / vimdiff2on commit Merge branch 'js/pthread-exit-emu-windows' (3978cd0)
   1. "$MERGE_TOOLS_DIR/vimdiff"