@conflict bash-completion-<2.17.0
bin/combinediff
bin/dehtmldiff
bin/editdiff
bin/espdiff
@bin bin/filterdiff
bin/fixcvsdiff
bin/flipdiff
bin/gitdiff
bin/gitdiffview
bin/gitshow
bin/gitshowview
bin/grepdiff
@bin bin/interdiff
bin/lsdiff
bin/move-to-front
bin/patchview
bin/patchview-wrapper
bin/recountdiff
@bin bin/rediff
bin/splitdiff
bin/svndiff
bin/svndiffview
bin/unwrapdiff
@man man/man1/combinediff.1
@man man/man1/dehtmldiff.1
@man man/man1/editdiff.1
@man man/man1/espdiff.1
@man man/man1/filterdiff.1
@man man/man1/fixcvsdiff.1
@man man/man1/flipdiff.1
@man man/man1/gitdiff.1
@man man/man1/gitdiffview.1
@man man/man1/gitshow.1
@man man/man1/gitshowview.1
@man man/man1/grepdiff.1
@man man/man1/interdiff.1
@man man/man1/lsdiff.1
@man man/man1/patchview.1
@man man/man1/recountdiff.1
@man man/man1/rediff.1
@man man/man1/splitdiff.1
@man man/man1/svndiff.1
@man man/man1/svndiffview.1
@man man/man1/unwrapdiff.1
share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/combinediff
share/bash-completion/completions/dehtmldiff
share/bash-completion/completions/editdiff
share/bash-completion/completions/espdiff
share/bash-completion/completions/filterdiff
share/bash-completion/completions/fixcvsdiff
share/bash-completion/completions/flipdiff
share/bash-completion/completions/gitdiff
share/bash-completion/completions/gitdiffview
share/bash-completion/completions/grepdiff
share/bash-completion/completions/interdiff
share/bash-completion/completions/lsdiff
share/bash-completion/completions/patchview
share/bash-completion/completions/recountdiff
share/bash-completion/completions/rediff
share/bash-completion/completions/splitdiff
share/bash-completion/completions/svndiff
share/bash-completion/completions/svndiffview
share/bash-completion/completions/unwrapdiff