testing: add missing `kdb rm` to testcase and use ni-output plugin
instead of mini, because that plugin is not supported by the buildserver
@@ -171,10 +171,13 @@ kdb merge -s ours user:/tests/ours user:/tests/theirs user:/tests/base user:/tes
The result KeySet, `user:/tests/result` will be:
```sh
-kdb export user:/tests/result mini
-#> key1=apple
-#> key2=pie
+kdb export user:/tests/result ni
+#> ;Ni1
+#> ; Generated by the ni plugin using Elektra (see libelektra.org).
+#>
#> key5 = fish
+#> key2 = pie
+#> key1 = apple
```
The conflict of `key4` (it was deleted in `ours` but changed in `theirs`) is solved by using our copy, thus deleting the key.
@@ -196,11 +199,14 @@ kdb merge -s theirs user:/tests/ours user:/tests/theirs user:/tests/base user:/t
The result KeySet, `user:/tests/result` will be:
```sh
-kdb export user:/tests/result mini
-#> key1=apple
-#> key2=pie
-#> key4=banana
+kdb export user:/tests/result ni
+#> ;Ni1
+#> ; Generated by the ni plugin using Elektra (see libelektra.org).
+#>
#> key5 = fish
+#> key4 = banana
+#> key2 = pie
+#> key1 = apple
```
Here, the conflict of `key4` is solved by using their copy, thus `key4=banana`.
@@ -210,6 +216,7 @@ We delete the result keys again and finally try the `cut` merging strategy.
```sh
kdb rm user:/tests/result/key1
kdb rm user:/tests/result/key2
+kdb rm user:/tests/result/key4
kdb rm user:/tests/result/key5
```
@@ -222,11 +229,14 @@ kdb merge -s cut user:/tests/ours user:/tests/theirs user:/tests/base user:/test
The result KeySet, `user:/tests/result` will be:
```sh
-kdb export user:/tests/result mini
-#> key1=1
-#> key2=pie
-#> key4=banana
+kdb export user:/tests/result ni
+#> ;Ni1
+#> ; Generated by the ni plugin using Elektra (see libelektra.org).
+#>
#> key5 = 5
+#> key4 = banana
+#> key2 = pie
+#> key1 = 1
```
Here the state of theirs is simply copied to the `resultpath`.
