change and commit test.rb
change test.rb in branch hotfix and commit
finished test.rb
used mergetool