mergetools / vimdiff2on commit Merge branch 'gb/filter-branch-progress' (a23d263)
   1. "$MERGE_TOOLS_DIR/vimdiff"