[PECL-CVS] [pecl-text-xdiff] main: try hack
[email protected] (Rasmus Lerdorf) Tue, 7 Apr 2026 12:20:47 +0000
| Newsgroups | php.pecl.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Rasmus Lerdorf (rlerdorf) Date: 2026-04-07T08:20:42-04:00 Commit: https://github.com/php/pecl-text-xdiff/commit/6c3b94fcea8d06f07cb35ee4d78345b813f0baa6 Raw diff: https://github.com/php/pecl-text-xdiff/commit/6c3b94fcea8d06f07cb35ee4d78345b813f0baa6.diff try hack Changed paths: M README.md Diff: diff --git a/README.md b/README.md index c92eabf..234cda6 100644 --- a/README.md +++ b/README.md @@ -31,37 +31,37 @@ make install ### Diff -```typescript +```hack xdiff_string_diff(string $str1, string $str2, int $context = 3, bool $minimal = false): string|false ``` Creates a unified diff of two strings. `$context` sets the number of surrounding lines. `$minimal` reduces diff size at the cost of speed. -```typescript +```hack xdiff_file_diff(string $file1, string $file2, string $dest, int $context = 3, bool $minimal = false): bool ``` Creates a unified diff of two files and writes the result to `$dest`. -```typescript +```hack xdiff_string_diff_binary(string $str1, string $str2): string|false ``` Creates a binary diff of two strings. -```typescript +```hack xdiff_file_diff_binary(string $file1, string $file2, string $dest): bool ``` Creates a binary diff of two files and writes the result to `$dest`. -```typescript +```hack xdiff_string_rabdiff(string $str1, string $str2): string|false ``` Creates a binary diff of two strings using the Rabin fingerprint algorithm. -```typescript +```hack xdiff_file_rabdiff(string $file1, string $file2, string $dest): bool ``` @@ -69,7 +69,7 @@ Creates a binary diff of two files using the Rabin fingerprint algorithm and wri ### Patch -```typescript +```hack xdiff_string_patch(string $file, string $patch, int $flags = XDIFF_PATCH_NORMAL, ?string &$error = null): string|bool ``` @@ -77,19 +77,19 @@ Applies a unified patch to a string. Returns the patched string, or `false` on e `$flags`: `XDIFF_PATCH_NORMAL` (default) or `XDIFF_PATCH_REVERSE`. -```typescript +```hack xdiff_file_patch(string $file, string $patch, string $dest, int $flags = XDIFF_PATCH_NORMAL): string|bool ``` Applies a unified patch from a file. Returns `true` on success, a string of rejected chunks on partial failure, or `false` on error. -```typescript +```hack xdiff_string_patch_binary(string $str, string $patch): string|false ``` Applies a binary patch to a string. Works with both bdiff and rabdiff patches. -```typescript +```hack xdiff_file_patch_binary(string $file, string $patch, string $dest): bool ``` @@ -97,13 +97,13 @@ Applies a binary patch from a file and writes the result to `$dest`. ### Merge -```typescript +```hack xdiff_string_merge3(string $str1, string $str2, string $str3, ?string &$error = null): string|bool ``` Three-way merge of strings. Returns the merged string, or `false` on error. Conflicts are returned via `$error`. -```typescript +```hack xdiff_file_merge3(string $file1, string $file2, string $file3, string $dest): string|bool ``` @@ -111,13 +111,13 @@ Three-way merge of files. Returns `true` on success, a string of rejected chunks ### Binary diff size -```typescript +```hack xdiff_string_bdiff_size(string $patch): int|false ``` Returns the size of the file that would be created by applying the given binary patch. -```typescript +```hack xdiff_file_bdiff_size(string $patch_file): int|false ```