mergetools / gvimdiff2on commit Merge branch 'js/trace2-to-directory' (1b40314)
   1. "$MERGE_TOOLS_DIR/vimdiff"