mergetools / gvimdiff2on commit Merge branch 'jc/describe' into maint (295e393)
   1. "$MERGE_TOOLS_DIR/vimdiff"