mergetools / gvimdiff2on commit Merge branch 'jk/show-branch-strbuf' (51ff04b)
   1. "$MERGE_TOOLS_DIR/vimdiff"