• Added JSON Merge Patch (RFC 7386) support. Jd can now produce and apply both JSON Merge Patch and a subset of JSON Patch (RFC 6902) files. Use the -f to select the CLI output format or select the Diff Format option in the UI.

fab3c38 Vendor dependencies because Docker can not seem to download them like ever. e2056ca Update Dockerfile to golang 1.18. 79536ad Set version 1.6.0. 042cc02 Stop make when version not set. 3bf0e16 Separate build and push steps of release and add version and dirty checks. 25cd5a1 Add RFC numbers to diff formats. 7a28e54 Add merge diff format to main.go. 78ce844 Add merge format to UI. d246d9b Add logo.png. 36256f8 Continue fuzzing other configurations after encountering an unsupported object key. 893b388 Fuzz make target. 6e999b5 Emit void new value for merge patches internally. 68e766a Ignore voids when reading merge diffs. 8141d7b Create empty object in merge. 61a069b Expect voids for deleting internally. 52900a7 Expect void when reading null merge patch. 3742455 Represent JSON merge nulls as voids internally. 94b98dd Add merge patch fuzzing. 68ac5c2 Delete object keys when encountering void node. 187cf56 Fix read void merge patch. d5a0ad9 Add missed diff_common.go file. 8b3cfac Drop object idKeys. 027b386 Common patch method. 6ee0475 Put color diff behind flag. 9d24bb1 Merge pull request #47 from neutralino/color_output_diff 00cda0f add color to output diff 055209b Diff RenderMerge and initial tests. baf7d7c Fix merge patch replacing list with object. c2b8233 Fix merge patch object with different type. 8191df7 RFC 7386 example tests. a3aad4a Make merge metadata all caps because it applies to the whole path. a36242d Read merge patch. 8488135 Merge strategy for new object elements. d78a368 Add a void node when deleting with merge strategy. 5f91785 Handle merge metadata case with non-empty path. e1330fa Number merge diff test. c410a55 Null merge diff tests. e6ffef2 Set merge diff. ab4339f Fix merge diff to replace entire multiset. ef3931c Helper function prependMetadataMerge. f0c36b4 Two multiset merge tests that do not pass yet. d7908f9 List diff merge strategy. 9d97ec6 Add patch strategy to diff signature so we know what to produce. 1c36706 Void merge strategy. e20ae8e String merge patch. 046f9df Set merge patch strategy. e79a34f Create JSON objects on demand during merge patch. 98a7e7b JSON merge patch null deletes a node. e2382c0 Multiset merge patch strategy. 4bfc6d0 Test for number merge patch. 72a7310 Replace entire array with merge patch strategy. e5ec41f A few more bool merge tests. a3a5252 Allow metadata on root node for merge patch strategy. 21769de Add patchStrategy to internal patch functions. 2a65693 Rename poly.go as metadata.go. 18549ae Add merge metadata. 14f8e51 Convert object tests into table tests. 3e68104 Test cleanup for consistency. d24e5c5 Delete unused checkNotEqual metadata input. 5f49c10 Rename array_test as list_test. 8363e76 Update installation to include brew install jd. 9de00ba Update usage. 16cb05b Remove build test_fuzz tag and backported fuzz tests. f7e8fb2 Upgrade dependencies.