diff --git a/test.txt b/test.txt index 4609b30..5c76ff9 100644 --- a/test.txt +++ b/test.txt @@ -23,3 +23,4 @@ bar bla ======= >>>>>>> parent of 73942cd (update) +bla