mergetools / gvimdiff2on commit Merge branch 'jk/rev-parse-cleanup' into maint (8f71209)
   1. "$MERGE_TOOLS_DIR/vimdiff"