merge-recursive: honor diff.algorithm
[git/gitster.git] / Documentation / .gitignore
bloba48448de32f98b1a054b36e886ea920bccebc494
1 *.xml
2 *.html
3 *.[1-8]
4 *.made
5 *.texi
6 *.pdf
7 git.info
8 gitman.info
9 howto-index.txt
10 doc.dep
11 cmds-*.txt
12 mergetools-*.txt
13 SubmittingPatches.txt
14 tmp-doc-diff/
15 GIT-ASCIIDOCFLAGS
16 /.build/
17 /GIT-EXCLUDED-PROGRAMS