/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2009-10-28 00:12:03 UTC
  • mfrom: (4774 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4775.
  • Revision ID: andrew.bennetts@canonical.com-20091028001203-m7lgs1wtnilgo3br
Merge lp:bzr, resolving NEWS conflict.

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