Rev 1933: (jam) fix bug #56307: external diff handles binary files even when LANG is not english in /home/pqm/archives/thelove/bzr/+trunk/

Wed Aug 16 17:47:04 BST 2006

------------------------------------------------------------
revno: 1933
revision-id: pqm at pqm.ubuntu.com-20060816164703-3e573c538a1e59c9
parent: pqm at pqm.ubuntu.com-20060816163926-d4ca6b00184494fe
parent: john at arbash-meinel.com-20060816160304-e95977cbd627c507
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-08-16 17:47:03 +0100
message:
  (jam) fix bug #56307: external diff handles binary files even when LANG is not english
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-20060816160304-e95977cbd627c507
    parent: john at arbash-meinel.com-20060815131113-be6662a39155dd33
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: external-diff-56307
    timestamp: Wed 2006-08-16 11:03:04 -0500
    message:
      Remove spurious import
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060815131113-be6662a39155dd33
    parent: john at arbash-meinel.com-20060814223825-3850491258695d79
    parent: pqm at pqm.ubuntu.com-20060815050217-d2df7c83d6c5eeca
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: external-diff-56307
    timestamp: Tue 2006-08-15 08:11:13 -0500
    message:
      [merge] bzr.dev 1923
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060814223825-3850491258695d79
    parent: pqm at pqm.ubuntu.com-20060814213105-9c0d22f04d44049e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: external-diff-56307
    timestamp: Mon 2006-08-14 17:38:25 -0500
    message:
      fix bug #56307, handle binary files even when LANG is not english