mergetools / gvimdiff3on commit Merge branch 'tg/reset-hard-show-head-with-pretty' into next (596a4ec)
   1. "$MERGE_TOOLS_DIR/vimdiff"