mergetools / gvimdiff2on commit Merge branch 'tm/line-log-first-parent' (64b9326)
   1. "$MERGE_TOOLS_DIR/vimdiff"