merge-recursive: honor diff.algorithm

[git/gitster.git] / Documentation / user-manual.conf

[titles]
        underlines="__","==","--","~~","^^"

[attributes]
caret=^
startsb=[
endsb=]
tilde=~

[linkgit-inlinemacro]
<ulink url="{target}.html">{target}{0?({0})}</ulink>