title: How to see history of modifications for a file from the diverged commit
body: <p>I'm trying to merge branches <code>U</code> into branch <code>L</code>. Suppose I have a conflict for the file <code>A.txt</code>. I want to take all changes from the remote and add manually all changes made locally. I understand that git applies 3-way-merge with one base commit. So I essentially need a list of all modifications (history) since the base. How can I get it? And is my logic correct?</p>
  <h3>Work in progress</h3>
  <p>I've run <code>git merge-base L U</code> and identified the common base <code>14b394adb</code>. I know I can get all history for a file using <code>git log --follow A.txt</code>. So I applied this:</p>
  <pre><code>git log 14b394adba..cb5c3b80fe --follow A.txt
  </code></pre>
  <p>which produced the list of commits. Now I need to get diff.</p>