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