--ignore-all-space for EGit
<p>I am using EGit(3.4.1.201406201815-r) with Eclipse (Mars.2 Release (4.5.2)). </p>

<p>When I try to merge a branch from the remote repository with my local repository I get a lot of conflicting files. 
The differences in these files are mainly caused by differences in the number of whitespaces or number of empty lines. I would like to ignore these. </p>

<p>For example I will get:: </p>

<pre><code>&lt;&lt;&lt; Head
4Whitespaces CR LF
==========
3Whitespaces CR LF
&gt;&gt;&gt;&gt; branch name
</code></pre>

<p>My goal for now is to ignore any kind of white spaces (white spaces, empty lines, line breaks, tabs, indents, etc.).</p>

<p>I already set these Preferences:</p>

<ul>
<li>Preferences/General/Compare/Patch ignore white space </li>
<li>Preferences/General/New text file line delimiter --> default(Windows)</li>
<li>Team/Git/Configuration User Settings: core.autocrlf = false</li>
<li>Team/Git/Configuration User Settings: core.whitespace= blank-at-eol, blank-at-eof, space-before-tab, cr-at-eol</li>
</ul>

<p>I saw that <a href="https://stackoverflow.com/a/9784089/1503237">one could use the command</a> </p>

<pre><code>  git merge -Xignore-all-space
</code></pre>

<p>Is there a possibility to use this in Egit as well?</p>