title: Equivalent of a git pre-merge hook?
body: <p>I work on a project where multiple developers must edit code using a single project file. Most of the code they edit is actually located in separate code module files, but then they must share the single project file amongst themselves.</p>
  
  <p>There are two types of things that the IDE writes to the project file:</p>
  
  <ol>
  <li><strong>Important stuff</strong>: i.e. listings of module files that makeup the project</li>
  <li><strong>Superfluous stuff</strong>: i.e. IDE dialog box X,Y position settings</li>
  </ol>
  
  <p>Because the IDE has no concept of splitting out the superfluous stuff into per-user settings files, we wind up with merge conflicts <strong>all the time</strong></p>
  
  <p><strong>Question:</strong> Does git provide an extension point (hook) that allows me to ignore the <strong>Superfluous Stuff</strong> when a user is merging a certain file type? My goal is to default to a "theirs/mine" type merge strategy for the <strong>Superfluous Stuff</strong> whilst handing the merging of the <strong>Important Stuff</strong> the same way it always does.</p>