mergetools / gvimdiff2on commit Merge branch 'ab/sha1dc-maint' (cbb8704)
   1. "$MERGE_TOOLS_DIR/vimdiff"