mergetools / vimdiff2on commit Merge branch 'jh/trace2' (49bc8ce)
   1. "$MERGE_TOOLS_DIR/vimdiff"