Permalink
Browse files

Updates to master from b, with merges from b-branch.

  • Loading branch information...
2 parents 078ddb8 + 5ad9b94 commit 06e27ff19b279847316910c5f895d76fd15b9333 @brian428 committed Jun 2, 2010
Showing with 7 additions and 5 deletions.
  1. +3 −2 file1.txt
  2. +4 −3 file2.txt
View
@@ -1,5 +1,6 @@
File1.txt
Version: 3
Changed in: a
-
-Now we have another update in a, master.
+Changed in: b-branch
+Now we have another update in a, master.
+Another change in b-branch.
View
@@ -1,5 +1,6 @@
File2.txt
Version: 3
-Changed in: a
-
-And we have still another update in a, master.
+Started in: a
+Changed in: b-branch
+And we have still another update in a, master.
+Another, different!, change in b-branch.

0 comments on commit 06e27ff

Please sign in to comment.