Hi,
To report this issue.
Let me know if there are any comments.
Thank you in advance!.
Alex
---- command ----
vagrant@local2:~/temp/merges/example008$ merge -p source-vim.json base-vim.json target-vim.json
<<<<<<< source-vim.json
start emailsource
success email
=======
start email
success emailtarget
>>>>>>> target-vim.json
merge: warning: conflicts during merge
---- expected result ----
No merge conflicts.
---- expected outcome ----
start emailsource
success emailtarget
---- file contents ----
vagrant@local2:~/temp/merges/example008$ cat base-vim.json
start email
success email
vagrant@local2:~/temp/merges/example008$ cat source-vim.json
start emailsource
success email
vagrant@local2:~/temp/merges/example008$ cat target-vim.json
start email
success emailtarget