ChristianWeissCG

Results 2 issues of ChristianWeissCG

I would love to see a 3-way diff: `json-cli threewaydiff base.json left.json right.json` And to get a combined patch for non-conflicting changes: ``` [ {"value":4,"op":"test","path":"/key1/0"}, {"value":5,"op":"replace","path":"/key1/0"}, {"op":"remove","path":"/key2"}, {"op":"remove","path":"/key3/sub0"}, {"value":"a","op":"test","path":"/key3/sub1"}, {"value":"c","op":"replace","path":"/key3/sub1"},...

This ticket here continous the descussion from: https://github.com/mozilla/sops/issues/52 Please see #52 for more background. ... As the MAC is a build-in feature that is maintained on all sops-operations i would...