title: How to merge changes within a line with Git?
body: <p>Assume the following situation:</p>
  
  <ol>
  <li>Create a file with contents <code>Hello World!</code>, add it, commit.</li>
  <li>Change it to <code>Hi World!</code> in one branch, and to <code>Hello World</code> in another branch.</li>
  <li>Now merging them will result in a conflict, because both changes are on the same line.</li>
  </ol>
  
  <p>Consider the alternative where we separate the changes on different lines:
  1. Create a file with contents <code>Hello\nWorld\n!</code>. (I'm denoting a line break by <code>\n</code>.)
  2. Apply the analogous changes as before.
  3. Now suddenly merging will work.</p>
  
  <p>But a line break is a character like any other. Why does merging treat it so special?</p>
  
  <p>More importantly, <strong>are there git-compatible merge tools that will merge my first example without conflicts</strong>, i.e. is it possible to merge changes within a line?</p>