merge command, showing conlict when successfull merge expected

--000000000000f4c2cd059ff3f066
Content-Type: text/plain; charset="UTF-8"

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

<https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail>
Libre
de virus. www.avast.com
<https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail>
<#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>

--000000000000f4c2cd059ff3f066
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>Hi,<br><br>To report this issue.<br>Let me know if th=
ere are any comments.<br>Thank you in advance!.<br>Alex<br><br>---- command=
 ---- <br>vagrant@local2:~/temp/merges/example008$ merge -p source-vim.json=
 base-vim.json target-vim.json<br>&lt;&lt;&lt;&lt;&lt;&lt;&lt; source-vim.j=
son<br>start emailsource<br>success email<br>=3D=3D=3D=3D=3D=3D=3D<br>start=
 email<br>success emailtarget<br>&gt;&gt;&gt;&gt;&gt;&gt;&gt; target-vim.js=
on<br>merge: warning: conflicts during merge<br><br>---- expected result --=
-- <br>No merge conflicts.<br><br>---- expected outcome ---- <br>start emai=
lsource<br>success emailtarget<br><br>---- file contents ---- <br>vagrant@l=
ocal2:~/temp/merges/example008$ cat base-vim.json<br>start email<br>success=
 email<br>vagrant@local2:~/temp/merges/example008$ cat source-vim.json<br>s=
tart emailsource<br>success email<br>vagrant@local2:~/temp/merges/example00=
8$ cat target-vim.json<br>start email<br>success emailtarget<br></div></div=
><div id=3D"DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2"><br> <table style=3D"bord=
er-top:1px solid #d3d4de">
	<tr>
      <td style=3D"width:55px;padding-top:18px"><a href=3D"https://www.avas=
t.com/sig-email?utm_medium=3Demail&amp;utm_source=3Dlink&amp;utm_campaign=
=3Dsig-email&amp;utm_content=3Dwebmail" target=3D"_blank"><img src=3D"https=
://ipmcdn.avast.com/images/icons/icon-envelope-tick-round-orange-animated-n=
o-repeat-v1.gif" alt=3D"" width=3D"46" height=3D"29" style=3D"width: 46px; =
height: 29px;"></a></td>
		<td style=3D"width:470px;padding-top:17px;color:#41424e;font-size:13px;fo=
nt-family:Arial,Helvetica,sans-serif;line-height:18px">Libre de virus. <a h=
ref=3D"https://www.avast.com/sig-email?utm_medium=3Demail&amp;utm_source=3D=
link&amp;utm_campaign=3Dsig-email&amp;utm_content=3Dwebmail" target=3D"_bla=
nk" style=3D"color:#4453ea">www.avast.com</a> 		</td>
	</tr>
</table>
<a href=3D"#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2" width=3D"1" height=3D"1">=
</a></div>

--000000000000f4c2cd059ff3f066--