mergetools / gvimdiff2on commit Merge branch 'ls/filter-process' into maint (d4a682d)
   1. "$MERGE_TOOLS_DIR/vimdiff"