eger has any meaningful effect.</p>
</div>
<div class="paragraph">
<p>For example, this line in <code>.gitattributes</code> can be used to tell the merge
machinery to leave much longer (instead of the usual 7-character-long)
conflict markers when merging the file <code>Documentation/git-merge.txt</code>
results in a conflict.</p>
</div>
<div class="listingblock">
<div class="content">
<pre>Documentation/git-merge.txt	conflict-marker-size=32</pre>
</div>
</div>
</div>
</div>
<div class="sect2"