diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
commit | 207df6fc406e81bfeebdff7f404bd242ff3f099f (patch) | |
tree | a1a796b056909dd0a04ffec163db9363a8757808 /update_expected_output.sh | |
parent | Releasing progress-linux version 0.11.2-1~progress7.99u1. (diff) | |
download | lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.tar.xz lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.zip |
Merging upstream version 0.12.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'update_expected_output.sh')
-rwxr-xr-x | update_expected_output.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/update_expected_output.sh b/update_expected_output.sh index ad416ee..57573eb 100755 --- a/update_expected_output.sh +++ b/update_expected_output.sh @@ -36,7 +36,7 @@ for fname in $(ls -t ${builddir}/*.cmd); do fi else if ! cmp "${exp_stem}.out" "${stem}.out"; then - diff -u "${exp_stem}.out" "${stem}.out" + diff --color=always -u "${exp_stem}.out" "${stem}.out" if test x"${AUTO_APPROVE}" = x""; then echo "Expected stdout is different, update with the above?" select yn in "Yes" "No"; do @@ -68,7 +68,7 @@ for fname in $(ls -t ${builddir}/*.cmd); do fi else if ! cmp "${exp_stem}.err" "${stem}.err"; then - diff -u "${exp_stem}.err" "${stem}.err" + diff --color=always -u "${exp_stem}.err" "${stem}.err" if test x"${AUTO_APPROVE}" = x""; then echo "Expected stderr is different, update with the above?" select yn in "Yes" "No"; do |