bkuhn/small-hacks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use cwdiff.

Browse source
This commit is contained in:
Bradley M. Kuhn 2014-07-16 08:27:37 -04:00
parent a90ad4b134
commit d47dbd0247
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
odtdiff
View file

@ -162,7 +162,11 @@ Main ()
odt2txt "$file2" > "$ft2" 2>/dev/null
then
if $DIFF_PROGRAM -L "$file1" -L "$file2" $opts "$ft1" "$ft2"
diffopts="-L \"$file1\" -L \"$file2\""
if [ "$diff_prg_name" == "cwdiff" ]; then
diffopts="--diff-opts \"--new-file --unified --show-c-function --recursive -L \"$file1\" -L \"$file2\""
fi
if $DIFF_PROGRAM $opts "$ft1" "$ft2"
then
# no text change
if diff -q "$file1" "$file2"; then