title: Subversion merge changes by character, not by line
body: <p>Is there anything that would allow to merge changes by character/word, rather than by whole line?</p>
  
  <p><strong>Example</strong><br>
  Trunk contains:&nbsp; <code>test(a1,a2,a3)</code><br>
  Branch contains:<code>test(a1,a2)</code>  </p>
  
  <p>The <code>a3</code> is part of a new feature, that isn't meant for trunk yet.<br>
  However, a bugfix is done one trunk, which changes <code>a1</code> -> <code>a0</code></p>
  
  <p>SVN Merge fails due to conflict on this line.</p>
  
  <p>If this a limitation of Subversion that it work on "by line" basis only?</p>