mergetools / gvimdiff2on commit Merge branch 'cb/log-follow-with-combined' (a1ddd11)
   1. "$MERGE_TOOLS_DIR/vimdiff"