diff --git a/file1.txt b/file1.txt index 97acb36..547495f 100644 --- a/file1.txt +++ b/file1.txt @@ -4,3 +4,4 @@ TEST br1: added by user2 br1: added by user1 br1: update +try amend diff --git a/file2.txt b/file2.txt index 212659b..7298134 100644 --- a/file2.txt +++ b/file2.txt @@ -1 +1,4 @@ rebase test +Line master +Line in br2 +Line in br2 diff --git a/file3.txt b/file3.txt new file mode 100644 index 0000000..d6eb89e --- /dev/null +++ b/file3.txt @@ -0,0 +1,2 @@ +br2 +merge again