update strategic patch test for merge list of maps

pull/6/head
AdoHe 2016-05-30 01:43:36 -04:00
parent 77de942e08
commit d06a77065a
1 changed files with 8 additions and 0 deletions

View File

@ -636,8 +636,12 @@ testCases:
mergingList:
- name: 3
value: 3
- name: 4
value: 4
modified:
mergingList:
- name: 4
value: 4
- name: 1
- name: 2
value: 2
@ -654,6 +658,8 @@ testCases:
mergingList:
- name: 3
value: 3
- name: 4
value: 4
result:
mergingList:
- name: 1
@ -663,6 +669,8 @@ testCases:
other: b
- name: 3
value: 3
- name: 4
value: 4
- description: merge lists of maps with conflict
original:
mergingList: