~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patches_data/binary.patch

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-26 07:45:29 UTC
  • mfrom: (4769.1.1 merge-2.0-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20091026074529-g0v5lnaqpzksl9kl
(andrew) Merge lp:bzr/2.0 into lp:bzr.  Includes fixes for #436325,
        #436794, #437626 and documentation improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Binary files bar        2009-10-14 19:49:59 +0000 and qux       2009-10-14 19:50:35 +0000 differ
 
2
--- baz 2009-10-14 19:49:59 +0000
 
3
+++ quxx        2009-10-14 19:51:00 +0000
 
4
@@ -1 +1 @@
 
5
-hello
 
6
+goodbye