flynx/diff.js
1
0
Fork 0
mirror of https://github.com/flynx/diff.js.git synced 2025-10-29 02:50:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

type fix...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-08-27 15:35:24 +03:00
parent 3ffbe78f57
commit 4b1df67a50
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -279,7 +279,7 @@ The `path` is a `"/"` or `"\"` separated string that supports the following item
- `"a|b"` - matches either `a` or `b` (same as: `OR('a', 'b')`) - `"a|b"` - matches either `a` or `b` (same as: `OR('a', 'b')`)
- `"!a"` - matches anything but `a` (smae as: `NOT('a')`) - `"!a"` - matches anything but `a` (smae as: `NOT('a')`)
*Note that `"**"` is a special case in that it can not be combined with other patterns above (e.g. in `"a|**"` the string `"**"` is treated literally and has not special meaning).* *Note that `"**"` is a special case in that it can not be combined with other patterns above (e.g. in `"a|**"` the string `"**"` is treated literally and has no special meaning).*
`diff.merge(diff) -> diff` `diff.merge(diff) -> diff`
Generate a merged *diff* containing the changes from both diff object. Generate a merged *diff* containing the changes from both diff object.