diff --git a/attributes b/attributes index e0b214c..4eff6df 100644 --- a/attributes +++ b/attributes @@ -4,11 +4,12 @@ *.tar.bz2 diff=tar-bz2 *.zip diff=zip -*.odt diff=pandoc -*.doc diff=pandoc -*.docx diff=pandoc -*.ods diff=localc +*.doc diff=doc +*.docx diff=docx +*.odt diff=odt + *.xls diff=localc *.xlsx diff=localc -*.odg diff=odf +*.ods diff=localc +*.odg diff=odf diff --git a/config b/config index 244a8e2..bd79295 100644 --- a/config +++ b/config @@ -36,7 +36,16 @@ prompt = false binary = true cachetextconv = true -[diff "pandoc"] + +[diff "doc"] + textconv=lowriter --cat + prompt = false + binary = true +[diff "docx"] + textconv=pandoc --to=markdown -f docx+styles + prompt = false + binary = true +[diff "odt"] textconv=pandoc --to=markdown prompt = false binary = true