mergetools / gvimdiff2on commit Merge branch 'tk/doc-filter-branch' (dbe71f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"