[Pkg-bazaar-commits] ./bzr/unstable r823: quote

[Martin Pool]

------------------------------------------------------------
revno: 823
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-07-05 17:24:16 +1000
message:
  quote
modified:
  bzrlib/merge3.py
-------------- next part --------------
=== modified file 'bzrlib/merge3.py'
--- a/bzrlib/merge3.py	2005-07-05 07:19:12 +0000
+++ b/bzrlib/merge3.py	2005-07-05 07:24:16 +0000
@@ -15,6 +15,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
+# mbp: "you know that thing where cvs gives you conflict markers?"
+# s: "i hate that."
+
+
 
 def intersect(ra, rb):
     """Given two ranges return the range where they intersect or None.