mergetools / gvimdiff2on commit Merge branch 'sb/sha1-file-cleanup' into maint (f04f860)
   1. "$MERGE_TOOLS_DIR/vimdiff"