mergetools / gvimdiff2on commit Merge branch 'dk/maint-t5150-dirname' (9a3f598)
   1. "$MERGE_TOOLS_DIR/vimdiff"