~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: Jelmer Vernooij
  • Date: 2009-02-23 20:55:58 UTC
  • mfrom: (4034 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4053.
  • Revision ID: jelmer@samba.org-20090223205558-1cx2k4w1zgs8r5qa
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
600
600
      +++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
601
601
      @@ -0,0 +1,1 @@
602
602
      +contents of parent/file1
603
 
      
 
603
\x20\x20\x20\x20\x20\x20
604
604
      === added file 'file2'
605
605
      --- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
606
606
      +++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ