mergetools / vimdiff3on commit Merge branch 'js/t5404-path-fix' (3d5a179)
   1. "$MERGE_TOOLS_DIR/vimdiff"