mergetools / gvimdiff2on commit Merge branch 'js/find-lib-h-with-ls-files-when-possible' (c0d97d2)
   1. "$MERGE_TOOLS_DIR/vimdiff"