diff --git a/NEWS b/NEWS index 0e42975..569c4ef 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,13 @@ GNU diffutils NEWS -*- outline -*- * Noteworthy changes in release ?.? (????-??-??) [?] +** Changes in behavior + + diff once again reports a difference with the diagnostic + "Binary files A and B differ" when at least one of the files + appears to be binary. From 2.8.4 through diffutils-2.9, it printed + "Files A and B differ". + * Noteworthy changes in release 2.9 (2010-02-11) [stable] diff --git a/src/analyze.c b/src/analyze.c index 0a18334..e797248 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -454,9 +454,14 @@ briefly_report (int changes, struct file_data const filevec[]) { char const *label0 = file_label[0] ? file_label[0] : filevec[0].name; char const *label1 = file_label[1] ? file_label[1] : filevec[1].name; - message ("Files %s and %s differ\n", label0, label1); - if (! brief) - changes = 2; + + if (brief) + message ("Files %s and %s differ\n", label0, label1); + else + { + message ("Binary files %s and %s differ\n", label0, label1); + changes = 2; + } } return changes;