Rev 1960: (Marien Zwart) fix binary files check for diffutils >= 2.8.4 in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1960
revision-id: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
parent: pqm at pqm.ubuntu.com-20060825200624-719b2ca847a04dfa
parent: john at arbash-meinel.com-20060826131854-85c339314698c940
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-08-26 14:27:27 +0100
message:
  (Marien Zwart) fix binary files check for diffutils >= 2.8.4
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060826131854-85c339314698c940
    parent: john at arbash-meinel.com-20060826131659-140bcaf758134ed2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Sat 2006-08-26 08:18:54 -0500
    message:
      NEWS: fix bug #57614
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060826131659-140bcaf758134ed2
    parent: john at arbash-meinel.com-20060823224238-89bbd75611a4eef9
    parent: marienz at gentoo.org-20060825204330-912b977a14a5a87f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Sat 2006-08-26 08:16:59 -0500
    message:
      [merge] Marien Zwart: Updates for newer diffutils.
    ------------------------------------------------------------
    merged: marienz at gentoo.org-20060825204330-912b977a14a5a87f
    parent: pqm at pqm.ubuntu.com-20060825200624-719b2ca847a04dfa
    parent: marienz at gentoo.org-20060824180144-b5b013e11e5709f4
    committer: Marien Zwart <marienz at gentoo.org>
    branch nick: bzr.dev
    timestamp: Fri 2006-08-25 22:43:30 +0200
    message:
      merge.
    ------------------------------------------------------------
    merged: marienz at gentoo.org-20060824180144-b5b013e11e5709f4
    parent: marienz at gentoo.org-20060824174709-83cf7a51d41c69f8
    committer: Marien Zwart <marienz at gentoo.org>
    branch nick: bzr.0.9
    timestamp: Thu 2006-08-24 20:01:44 +0200
    message:
      Make the tests pass with recent versions of diffutils.
    ------------------------------------------------------------
    merged: marienz at gentoo.org-20060824174709-83cf7a51d41c69f8
    parent: pqm at pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82
    committer: Marien Zwart <marienz at gentoo.org>
    branch nick: bzr.0.9
    timestamp: Thu 2006-08-24 19:47:09 +0200
    message:
      Make external diff in binary mode work with recent versions of diffutils.