diff --git a/foo b/foo index 4ba99ad..97a9831 100644 --- a/foo +++ b/foo @@ -1,2 +1,4 @@ this is a better message in the "foo" file. + + this line has been written in branch_a