c
f
Merge remote-tracking branch 'upstream/newbranch' into newbranch
commit
c
c
x
c
c
c
c
c
c
c
c
Merge remote-tracking branch 'upstream/newbranch' into newbranch
committed
c
c
c