title: Perforce line-by-line merge
body: <p>I am trying to get familiar with P4 trying to resolve a merge conflict. Let's suppose User1 and User2 got their development stream from mainline and they are both working on the same file: User1 write &quot;string 1&quot; first and submit changes and copied to main. User2 get the new file and add a new string &quot;another string&quot;. User2 do not submit. User1 change &quot;string 1 &quot; into &quot;string 2&quot; and submit changes again.</p>
  <p>User2 try to submit change but cannot copy to main because first line conflicted. So trying to merge-down with 3-way merge tool do not let User2 what to select line-by-line. Is that the normal behavior? The only solution seems to accept User2 solution and manually edit first line to change &quot;1&quot; into &quot;2&quot;. I am not sure why it is not possible as User2 still got the old &quot;string 1&quot; which has nothing to do with the new line being added..</p>