mergetools / gvimdiff2on commit Merge branch 'rt/bfg-ad-in-filter-branch-doc' (8a33472)
   1. "$MERGE_TOOLS_DIR/vimdiff"