~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patches_data/binary-after-normal.patch

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-16 21:11:35 UTC
  • mfrom: (4797.1.5 2.1.0b4-dev)
  • Revision ID: pqm@pqm.ubuntu.com-20091116211135-yrz2cqc5t8h56lve
(jam) Merge 2.1.0b3 back to trunk, and start 2.1.0dev4

Show diffs side-by-side

added added

removed removed

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