List:Commits« Previous MessageNext Message »
From:Olav Sandstaa Date:May 28 2008 1:06pm
Subject:commit into MySQL/Falcon helper scripts, tests,
and programs:mysql-falcon branch (olav:201)
View as plain text  
#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/

  201 Olav Sandstaa	2008-05-28 [merge]
      Konfliktld:
  bzr_testing/hello_bzr_olav.txt


=== modified file 'bzr_testing/hello_bzr_olav.txt'
--- a/bzr_testing/hello_bzr_olav.txt	2008-05-28 13:02:25 +0000
+++ b/bzr_testing/hello_bzr_olav.txt	2008-05-28 13:06:11 +0000
@@ -1,4 +1,4 @@
 Hei, dette er ei test-fil for Bazaar.
-Her er ei lita oppdatering: konflikt to
+Her er ei lita oppdatering: ein-og-ein-halv
 
 ..olav
Thread
• commit into MySQL/Falcon helper scripts, tests,and programs:mysql-falcon branch (olav:201) Olav Sandstaa28 May