title: Why is BeyondCompare 4 / Git trying to perform a text diff on binary files?
body: <p>I'm trying to merge a branch which has a different .NET <code>.dll</code> and <code>.pdb</code>, and git/BC4 is trying to do a text merge on the files instead of letting me choose local vs remote.</p>
  
  <p>I've never experienced this before, presumably I have changed some setting or BC4 has some difference to BC3.</p>
  
  <p>My relevant <code>.gitconfig</code></p>
  
  <pre><code>[merge]
      tool = bec3
      renamelimit = 2000
  [mergetool]
      prompt = false
      keepBackup = false
  [mergetool "bec3"]
      cmd = \"C:/Program Files (x86)/Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
      trustExitCode = true
  </code></pre>
  
  <p>I'm using msysgit 1.9.5 and Beyond Compare 4.0.3</p>
  
  <p><strong>Edit:</strong> I dont want to binary merge, git used to simply make me choose the local or remote file to resolve the conflict. My question is "is this a git setting (if so, what?) or a BC setting?"</p>