mergetools / vimdiff3on commit Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' (ccce1e5)
   1. "$MERGE_TOOLS_DIR/vimdiff"