mergetools / vimdiff3on commit Merge branch 'jh/trace2' (90f2d88)
   1. "$MERGE_TOOLS_DIR/vimdiff"