ignore log.txt
display diffs
display diff a file per line