tests: use kdb export dump output for merge tutorial test
because buildserver doesn't support other output plugins
@@ -171,13 +171,18 @@ 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 ni
-#> ;Ni1
-#> ; Generated by the ni plugin using Elektra (see libelektra.org).
-#>
-#> key5 = fish
-#> key2 = pie
-#> key1 = apple
+kdb export user:/tests/result
+#> kdbOpen 2
+#> $key string 4 5
+#> key1
+#> apple
+#> $key string 4 3
+#> key2
+#> pie
+#> $key string 4 4
+#> key5
+#> fish
+#> $end
```
The conflict of `key4` (it was deleted in `ours` but changed in `theirs`) is solved by using our copy, thus deleting the key.
@@ -199,14 +204,21 @@ 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 ni
-#> ;Ni1
-#> ; Generated by the ni plugin using Elektra (see libelektra.org).
-#>
-#> key5 = fish
-#> key4 = banana
-#> key2 = pie
-#> key1 = apple
+kdb export user:/tests/result
+#> kdbOpen 2
+#> $key string 4 5
+#> key1
+#> apple
+#> $key string 4 3
+#> key2
+#> pie
+#> $key string 4 6
+#> key4
+#> banana
+#> $key string 4 4
+#> key5
+#> fish
+#> $end
```
Here, the conflict of `key4` is solved by using their copy, thus `key4=banana`.
@@ -229,14 +241,21 @@ 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 ni
-#> ;Ni1
-#> ; Generated by the ni plugin using Elektra (see libelektra.org).
-#>
-#> key5 = 5
-#> key4 = banana
-#> key2 = pie
-#> key1 = 1
+kdb export user:/tests/result
+#> kdbOpen 2
+#> $key string 4 1
+#> key1
+#> 1
+#> $key string 4 3
+#> key2
+#> pie
+#> $key string 4 6
+#> key4
+#> banana
+#> $key string 4 1
+#> key5
+#> 5
+#> $end
```
Here the state of theirs is simply copied to the `resultpath`.
