~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to testdata/insert_top.patch

  • Committer: Robert Collins
  • Date: 2005-10-24 09:31:46 UTC
  • mto: (147.1.42) (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: robertc@robertcollins.net-20051024093146-e8ebf09b05d1fc55
tweak to fix reusing history with more than one candidate ancestor

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- orig/pylon/patches.py
 
2
+++ mod/pylon/patches.py
 
3
@@ -1,3 +1,4 @@
 
4
+#test
 
5
 import util
 
6
 import sys
 
7
 class PatchSyntax(Exception):