title: How to ignore merge conflict?
body: <p>I have next merge conflict:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream
      my( $c, $name ) =  (shift,shift);
    my %name =  defined $name ? ( name =&gt; $name ) : ();
  
  ||||||| merged common ancestors
      my( $c ) =  shift;
  =======
      my( $c, $name ) =  (shift,shift);
  
    my %name =  defined $name ? ( name =&gt; $name ) : ();
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes
  
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream
      return $c-&gt;render_to_string( 'control/toggle', id =&gt; "toggle$id", %name, @_ );
  ||||||| merged common ancestors
    return $c-&gt;render_to_string( 'control/toggle', @_, id =&gt; "toggle$id" );
  =======
      return $c-&gt;render_to_string( 'control/toggle', id =&gt; "toggle$id",  %name,  @_ );
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes
  </code></pre>
  
  <p>Is there an option to ignore such conflicts if there are only changes in whitespace? Just like <code>-w -b</code> options</p>