title: How do I accept both changes in vimdiff hunk?
body: <p>When resolving merge conflicts, a fairly common pattern is that both I and another person have modified a list or some other section of code which commonly gets appended to. Such as:</p>
  
  <pre><code>global.registerFeature(fc);
  global.registerFeature(fb);
  global.registerFeature(fa);
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; 
  global.registerFeature(aNewFeature);
  =======
  global.registerFeature(anotherNewFeature);
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; 
  </code></pre>
  
  <p>When I look at a merge conflict like this in vimdiff, vim gives me options for choosing one or the other. But what I want to do is apply both diffs. I usually just resort to editing the merged file directly (just deleting the merge markers); but is there an easier way to do this in vimdiff?</p>