bob$ git merge --no-ff carol/vroom -m 'Merge Carol'\''s change'
Merge made by the 'ort' strategy.
 main.rs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)
