title: Is there a way to turn off git conflict resolution?
body: <p>Is there a way to completely turn off git's attempts to resolve conflicts before feeding files into 3-way merge tool?</p>
  
  <p>I mean those lines:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; Temporary merge branch 1
  ...
  =======
  ...
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; Temporary merge branch 2
  </code></pre>
  
  <p>It adds them and branch changes into the base file before feeding it into kdiff3, and the later one goes completely mad showing weird conflicts.</p>
  
  <p>I would like to simply have the base revision untouched.</p>
  
  <p>So far I've only found the option</p>
  
  <pre><code>merge.conflictstyle
  </code></pre>
  
  <p>but it seems to have no option to turn these lines off.</p>
  
  <p>Is there any way except writing a preprocessor that would strip the lines?</p>
  
  <p><strong>UPDATE</strong></p>
  
  <p>I'll explain what I dislike here.</p>
  
  <p>The problem is that when git launches kdiff3 the BASE revision contains lines like</p>
  
  <pre><code>X1
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; Temporary merge branch 1
  A
  =======
  B
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; Temporary merge branch 2
  X2
  </code></pre>
  
  <p>The LOCAL revision contains:</p>
  
  <pre><code>X1
  A
  X2
  </code></pre>
  
  <p>And the REMOTE revision contains:</p>
  
  <pre><code>X1
  B
  X2
  </code></pre>
  
  <p>where <code>X1</code> and <code>X2</code> are some common lines of code between 3 files.</p>
  
  <p>Now, kdiff3 signals a conflict here.</p>
  
  <p>If I grab the files, copy them to a separate folder and remove everything between <code>&lt;</code> and <code>&gt;</code>, kdiff3 merges files way better, sometimes automatically.</p>
  
  <p>From what I can see at <a href="http://www.gitguys.com/topics/merging-with-a-gui/">http://www.gitguys.com/topics/merging-with-a-gui/</a>, it looks like it actually should not show the lines in the BASE revision. But it does. How do I fix it?</p>
  
  <p><strong>Git config</strong></p>
  
  <p><code>git config -l</code> gives this:</p>
  
  <pre><code>core.symlinks=false
  core.autocrlf=false
  color.diff=auto
  color.status=auto
  color.branch=auto
  color.interactive=true
  pack.packsizelimit=2g
  help.format=html
  http.sslcainfo=/bin/curl-ca-bundle.crt
  sendemail.smtpserver=/bin/msmtp.exe
  diff.astextplain.textconv=astextplain
  rebase.autosquash=true
  user.name=Pavel Gatilov
  user.email=********
  merge.tool=kdiff3
  mergetool.kdiff3.path=C:/Program Files (x86)/KDiff3/kdiff3.exe
  diff.guitool=kdiff3
  difftool.kdiff3.path=C:/Program Files (x86)/KDiff3/kdiff3.exe
  difftool.kdiff3.cmd="C:/Program Files (x86)/KDiff3/kdiff3.exe" "$LOCAL" "$REMOTE"
  core.editor="C:/Program Files (x86)/GitExtensions/GitExtensions.exe" fileeditor
  core.autocrlf=false
  credential.helper=!"C:/Program Files (x86)/GitExtensions/GitCredentialWinStore/git-credential-winstore.exe"
  core.repositoryformatversion=0
  core.filemode=false
  core.bare=false
  core.logallrefupdates=true
  core.symlinks=false
  core.ignorecase=true
  core.hidedotfiles=dotGitOnly
  core.safecrlf=true
  remote.origin.url=********
  remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
  branch.develop.remote=origin
  branch.develop.merge=refs/heads/develop
  gui.wmstate=normal
  gui.geometry=887x427+175+175 171 192
  branch.8480-il.remote=origin
  branch.8480-il.merge=refs/heads/8480-il
  branch.branch-9354.remote=origin
  branch.branch-9354.merge=refs/heads/branch-9354
  </code></pre>
  
  <p><strong>Versions</strong></p>
  
  <p>I use:</p>
  
  <pre>
  Tool             Version
  ------------------------
  msysgit          1.8.1.msysgit.1
  Git Extensions   2.44
  kdiff3           0.9.97
  </pre>
  
  <p>The issue exists both when I run merge via Git Extensions and via <code>git mergetool</code></p>
  
  <p><strong>UPDATE 2</strong></p>
  
  <p>I've tried configuring kdiff3 preprocessor command to remove the unwanted parts of files, but it seems to work on a per-line basis, so it can't fix the issue.</p>
  
  <p>I could write a preprocessor-wrapper, but I don't want to do that yet.</p>