mergetools / gvimdiff3on commit Merge branch 'jc/calloc-pathspec' into maint (ae6ac84)
   1. "$MERGE_TOOLS_DIR/vimdiff"